Commit 63cd2f7f authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen

scsi: fdomain: move bus reset to host reset

The bus reset function really is a host reset, so move it to
eh_host_reset_handler().
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent aceb2948
...@@ -933,7 +933,7 @@ struct Scsi_Host *__fdomain_16x0_detect(struct scsi_host_template *tpnt ) ...@@ -933,7 +933,7 @@ struct Scsi_Host *__fdomain_16x0_detect(struct scsi_host_template *tpnt )
} }
} }
fdomain_16x0_bus_reset(NULL); fdomain_16x0_host_reset(NULL);
if (fdomain_test_loopback()) { if (fdomain_test_loopback()) {
printk(KERN_ERR "scsi: <fdomain> Detection failed (loopback test failed at port base 0x%x)\n", port_base); printk(KERN_ERR "scsi: <fdomain> Detection failed (loopback test failed at port base 0x%x)\n", port_base);
...@@ -1568,7 +1568,7 @@ static int fdomain_16x0_abort(struct scsi_cmnd *SCpnt) ...@@ -1568,7 +1568,7 @@ static int fdomain_16x0_abort(struct scsi_cmnd *SCpnt)
return SUCCESS; return SUCCESS;
} }
int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt) int fdomain_16x0_host_reset(struct scsi_cmnd *SCpnt)
{ {
unsigned long flags; unsigned long flags;
...@@ -1758,7 +1758,7 @@ struct scsi_host_template fdomain_driver_template = { ...@@ -1758,7 +1758,7 @@ struct scsi_host_template fdomain_driver_template = {
.info = fdomain_16x0_info, .info = fdomain_16x0_info,
.queuecommand = fdomain_16x0_queue, .queuecommand = fdomain_16x0_queue,
.eh_abort_handler = fdomain_16x0_abort, .eh_abort_handler = fdomain_16x0_abort,
.eh_bus_reset_handler = fdomain_16x0_bus_reset, .eh_host_reset_handler = fdomain_16x0_host_reset,
.bios_param = fdomain_16x0_biosparam, .bios_param = fdomain_16x0_biosparam,
.release = fdomain_16x0_release, .release = fdomain_16x0_release,
.can_queue = 1, .can_queue = 1,
......
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
extern struct scsi_host_template fdomain_driver_template; extern struct scsi_host_template fdomain_driver_template;
extern int fdomain_setup(char *str); extern int fdomain_setup(char *str);
extern struct Scsi_Host *__fdomain_16x0_detect(struct scsi_host_template *tpnt ); extern struct Scsi_Host *__fdomain_16x0_detect(struct scsi_host_template *tpnt );
extern int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt); extern int fdomain_16x0_host_reset(struct scsi_cmnd *SCpnt);
...@@ -173,7 +173,7 @@ static void fdomain_release(struct pcmcia_device *link) ...@@ -173,7 +173,7 @@ static void fdomain_release(struct pcmcia_device *link)
static int fdomain_resume(struct pcmcia_device *link) static int fdomain_resume(struct pcmcia_device *link)
{ {
fdomain_16x0_bus_reset(NULL); fdomain_16x0_host_reset(NULL);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment