Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Hannes Reinecke and committed by
Martin K. Petersen
63cd2f7f aceb2948

+5 -5
+3 -3
drivers/scsi/fdomain.c
··· 933 933 } 934 934 } 935 935 936 - fdomain_16x0_bus_reset(NULL); 936 + fdomain_16x0_host_reset(NULL); 937 937 938 938 if (fdomain_test_loopback()) { 939 939 printk(KERN_ERR "scsi: <fdomain> Detection failed (loopback test failed at port base 0x%x)\n", port_base); ··· 1568 1568 return SUCCESS; 1569 1569 } 1570 1570 1571 - int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt) 1571 + int fdomain_16x0_host_reset(struct scsi_cmnd *SCpnt) 1572 1572 { 1573 1573 unsigned long flags; 1574 1574 ··· 1758 1758 .info = fdomain_16x0_info, 1759 1759 .queuecommand = fdomain_16x0_queue, 1760 1760 .eh_abort_handler = fdomain_16x0_abort, 1761 - .eh_bus_reset_handler = fdomain_16x0_bus_reset, 1761 + .eh_host_reset_handler = fdomain_16x0_host_reset, 1762 1762 .bios_param = fdomain_16x0_biosparam, 1763 1763 .release = fdomain_16x0_release, 1764 1764 .can_queue = 1,
+1 -1
drivers/scsi/fdomain.h
··· 21 21 extern struct scsi_host_template fdomain_driver_template; 22 22 extern int fdomain_setup(char *str); 23 23 extern struct Scsi_Host *__fdomain_16x0_detect(struct scsi_host_template *tpnt ); 24 - extern int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt); 24 + extern int fdomain_16x0_host_reset(struct scsi_cmnd *SCpnt);
+1 -1
drivers/scsi/pcmcia/fdomain_stub.c
··· 173 173 174 174 static int fdomain_resume(struct pcmcia_device *link) 175 175 { 176 - fdomain_16x0_bus_reset(NULL); 176 + fdomain_16x0_host_reset(NULL); 177 177 178 178 return 0; 179 179 }