aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-05-28 07:52:51 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-17 13:04:45 -0400
commit3471c288036bf0835a82d0b1bbce2002f6e68390 (patch)
tree9a646a16877b7c600c583a32f703dd02a621c603 /drivers
parente3df715501be3329986e5d9dfa9a477f49e7996b (diff)
[SCSI] Remove no-op implementations of SCSI EH hooks
Drivers need not implement a hook that returns FAILED, and does nothing else, since the SCSI midlayer code will do that for us. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/53c700.c12
-rw-r--r--drivers/scsi/NCR5380.c28
-rw-r--r--drivers/scsi/NCR5380.h2
-rw-r--r--drivers/scsi/NCR53c406a.c19
-rw-r--r--drivers/scsi/aacraid/linit.c9
-rw-r--r--drivers/scsi/aha1542.c15
-rw-r--r--drivers/scsi/aha1542.h1
-rw-r--r--drivers/scsi/arm/cumana_1.c2
-rw-r--r--drivers/scsi/arm/ecoscsi.c2
-rw-r--r--drivers/scsi/arm/oak.c2
-rw-r--r--drivers/scsi/dmx3191d.c2
-rw-r--r--drivers/scsi/dtc.c2
-rw-r--r--drivers/scsi/dtc.h4
-rw-r--r--drivers/scsi/eata.c2
-rw-r--r--drivers/scsi/fcal.c1
-rw-r--r--drivers/scsi/fd_mcs.c12
-rw-r--r--drivers/scsi/g_NCR5380.c2
-rw-r--r--drivers/scsi/g_NCR5380.h4
-rw-r--r--drivers/scsi/gdth.c23
-rw-r--r--drivers/scsi/in2000.c13
-rw-r--r--drivers/scsi/in2000.h2
-rw-r--r--drivers/scsi/mac53c94.c6
-rw-r--r--drivers/scsi/mac_scsi.c2
-rw-r--r--drivers/scsi/mac_scsi.h2
-rw-r--r--drivers/scsi/nsp32.c1
-rw-r--r--drivers/scsi/pas16.c2
-rw-r--r--drivers/scsi/pas16.h4
-rw-r--r--drivers/scsi/pcmcia/nsp_cs.c15
-rw-r--r--drivers/scsi/pcmcia/qlogic_stub.c2
-rw-r--r--drivers/scsi/pluto.c1
-rw-r--r--drivers/scsi/qlogicfas.c2
-rw-r--r--drivers/scsi/qlogicfas408.c20
-rw-r--r--drivers/scsi/qlogicfas408.h2
-rw-r--r--drivers/scsi/seagate.c12
-rw-r--r--drivers/scsi/seagate.h2
-rw-r--r--drivers/scsi/sym53c416.c18
-rw-r--r--drivers/scsi/sym53c416.h3
-rw-r--r--drivers/scsi/t128.c2
-rw-r--r--drivers/scsi/t128.h4
-rw-r--r--drivers/scsi/u14-34f.c2
40 files changed, 0 insertions, 261 deletions
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index 4b1bb529f676..8c64212e9608 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -170,7 +170,6 @@ MODULE_LICENSE("GPL");
170STATIC int NCR_700_queuecommand(struct scsi_cmnd *, void (*done)(struct scsi_cmnd *)); 170STATIC int NCR_700_queuecommand(struct scsi_cmnd *, void (*done)(struct scsi_cmnd *));
171STATIC int NCR_700_abort(struct scsi_cmnd * SCpnt); 171STATIC int NCR_700_abort(struct scsi_cmnd * SCpnt);
172STATIC int NCR_700_bus_reset(struct scsi_cmnd * SCpnt); 172STATIC int NCR_700_bus_reset(struct scsi_cmnd * SCpnt);
173STATIC int NCR_700_dev_reset(struct scsi_cmnd * SCpnt);
174STATIC int NCR_700_host_reset(struct scsi_cmnd * SCpnt); 173STATIC int NCR_700_host_reset(struct scsi_cmnd * SCpnt);
175STATIC void NCR_700_chip_setup(struct Scsi_Host *host); 174STATIC void NCR_700_chip_setup(struct Scsi_Host *host);
176STATIC void NCR_700_chip_reset(struct Scsi_Host *host); 175STATIC void NCR_700_chip_reset(struct Scsi_Host *host);
@@ -330,7 +329,6 @@ NCR_700_detect(struct scsi_host_template *tpnt,
330 /* Fill in the missing routines from the host template */ 329 /* Fill in the missing routines from the host template */
331 tpnt->queuecommand = NCR_700_queuecommand; 330 tpnt->queuecommand = NCR_700_queuecommand;
332 tpnt->eh_abort_handler = NCR_700_abort; 331 tpnt->eh_abort_handler = NCR_700_abort;
333 tpnt->eh_device_reset_handler = NCR_700_dev_reset;
334 tpnt->eh_bus_reset_handler = NCR_700_bus_reset; 332 tpnt->eh_bus_reset_handler = NCR_700_bus_reset;
335 tpnt->eh_host_reset_handler = NCR_700_host_reset; 333 tpnt->eh_host_reset_handler = NCR_700_host_reset;
336 tpnt->can_queue = NCR_700_COMMAND_SLOTS_PER_HOST; 334 tpnt->can_queue = NCR_700_COMMAND_SLOTS_PER_HOST;
@@ -1980,16 +1978,6 @@ NCR_700_bus_reset(struct scsi_cmnd * SCp)
1980} 1978}
1981 1979
1982STATIC int 1980STATIC int
1983NCR_700_dev_reset(struct scsi_cmnd * SCp)
1984{
1985 printk(KERN_INFO "scsi%d (%d:%d) New error handler wants device reset\n\t",
1986 SCp->device->host->host_no, SCp->device->id, SCp->device->lun);
1987 scsi_print_command(SCp);
1988
1989 return FAILED;
1990}
1991
1992STATIC int
1993NCR_700_host_reset(struct scsi_cmnd * SCp) 1981NCR_700_host_reset(struct scsi_cmnd * SCp)
1994{ 1982{
1995 printk(KERN_INFO "scsi%d (%d:%d) New error handler wants HOST reset\n\t", 1983 printk(KERN_INFO "scsi%d (%d:%d) New error handler wants HOST reset\n\t",
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 770fa841e389..7ae19d4181be 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -2833,31 +2833,3 @@ static int NCR5380_bus_reset(Scsi_Cmnd * cmd) {
2833 do_reset(cmd->device->host); 2833 do_reset(cmd->device->host);
2834 return SUCCESS; 2834 return SUCCESS;
2835} 2835}
2836
2837/*
2838 * Function : int NCR5380_device_reset (Scsi_Cmnd *cmd)
2839 *
2840 * Purpose : reset a SCSI device
2841 *
2842 * Returns : FAILED
2843 *
2844 * Locks: io_request_lock held by caller
2845 */
2846
2847static int NCR5380_device_reset(Scsi_Cmnd * cmd) {
2848 return FAILED;
2849}
2850
2851/*
2852 * Function : int NCR5380_host_reset (Scsi_Cmnd *cmd)
2853 *
2854 * Purpose : reset a SCSI device
2855 *
2856 * Returns : FAILED
2857 *
2858 * Locks: io_request_lock held by caller
2859 */
2860
2861static int NCR5380_host_reset(Scsi_Cmnd * cmd) {
2862 return FAILED;
2863}
diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h
index b5103f94d627..c3462e358d1c 100644
--- a/drivers/scsi/NCR5380.h
+++ b/drivers/scsi/NCR5380.h
@@ -306,8 +306,6 @@ static void NCR5380_print(struct Scsi_Host *instance);
306#endif 306#endif
307static int NCR5380_abort(Scsi_Cmnd * cmd); 307static int NCR5380_abort(Scsi_Cmnd * cmd);
308static int NCR5380_bus_reset(Scsi_Cmnd * cmd); 308static int NCR5380_bus_reset(Scsi_Cmnd * cmd);
309static int NCR5380_host_reset(Scsi_Cmnd * cmd);
310static int NCR5380_device_reset(Scsi_Cmnd * cmd);
311static int NCR5380_queue_command(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)); 309static int NCR5380_queue_command(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *));
312static int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer, char **start, 310static int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer, char **start,
313off_t offset, int length, int inout); 311off_t offset, int length, int inout);
diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c
index c685d546f838..7c025b6cdd7c 100644
--- a/drivers/scsi/NCR53c406a.c
+++ b/drivers/scsi/NCR53c406a.c
@@ -722,12 +722,6 @@ static int NCR53c406a_queue(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
722 return 0; 722 return 0;
723} 723}
724 724
725static int NCR53c406a_abort(Scsi_Cmnd * SCpnt)
726{
727 DEB(printk("NCR53c406a_abort called\n"));
728 return FAILED; /* Don't know how to abort */
729}
730
731static int NCR53c406a_host_reset(Scsi_Cmnd * SCpnt) 725static int NCR53c406a_host_reset(Scsi_Cmnd * SCpnt)
732{ 726{
733 DEB(printk("NCR53c406a_reset called\n")); 727 DEB(printk("NCR53c406a_reset called\n"));
@@ -741,16 +735,6 @@ static int NCR53c406a_host_reset(Scsi_Cmnd * SCpnt)
741 return SUCCESS; 735 return SUCCESS;
742} 736}
743 737
744static int NCR53c406a_device_reset(Scsi_Cmnd * SCpnt)
745{
746 return FAILED;
747}
748
749static int NCR53c406a_bus_reset(Scsi_Cmnd * SCpnt)
750{
751 return FAILED;
752}
753
754static int NCR53c406a_biosparm(struct scsi_device *disk, 738static int NCR53c406a_biosparm(struct scsi_device *disk,
755 struct block_device *dev, 739 struct block_device *dev,
756 sector_t capacity, int *info_array) 740 sector_t capacity, int *info_array)
@@ -1075,9 +1059,6 @@ static Scsi_Host_Template driver_template =
1075 .release = NCR53c406a_release, 1059 .release = NCR53c406a_release,
1076 .info = NCR53c406a_info /* info */, 1060 .info = NCR53c406a_info /* info */,
1077 .queuecommand = NCR53c406a_queue /* queuecommand */, 1061 .queuecommand = NCR53c406a_queue /* queuecommand */,
1078 .eh_abort_handler = NCR53c406a_abort /* abort */,
1079 .eh_bus_reset_handler = NCR53c406a_bus_reset /* reset */,
1080 .eh_device_reset_handler = NCR53c406a_device_reset /* reset */,
1081 .eh_host_reset_handler = NCR53c406a_host_reset /* reset */, 1062 .eh_host_reset_handler = NCR53c406a_host_reset /* reset */,
1082 .bios_param = NCR53c406a_biosparm /* biosparm */, 1063 .bios_param = NCR53c406a_biosparm /* biosparm */,
1083 .can_queue = 1 /* can_queue */, 1064 .can_queue = 1 /* can_queue */,
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index c2be8380dad5..b48843402cf4 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -367,14 +367,6 @@ static int aac_ioctl(struct scsi_device *sdev, int cmd, void __user * arg)
367} 367}
368 368
369/* 369/*
370 * XXX: does aac really need no error handling??
371 */
372static int aac_eh_abort(struct scsi_cmnd *cmd)
373{
374 return FAILED;
375}
376
377/*
378 * aac_eh_reset - Reset command handling 370 * aac_eh_reset - Reset command handling
379 * @scsi_cmd: SCSI command block causing the reset 371 * @scsi_cmd: SCSI command block causing the reset
380 * 372 *
@@ -683,7 +675,6 @@ static struct scsi_host_template aac_driver_template = {
683 .bios_param = aac_biosparm, 675 .bios_param = aac_biosparm,
684 .shost_attrs = aac_attrs, 676 .shost_attrs = aac_attrs,
685 .slave_configure = aac_slave_configure, 677 .slave_configure = aac_slave_configure,
686 .eh_abort_handler = aac_eh_abort,
687 .eh_host_reset_handler = aac_eh_reset, 678 .eh_host_reset_handler = aac_eh_reset,
688 .can_queue = AAC_NUM_IO_FIB, 679 .can_queue = AAC_NUM_IO_FIB,
689 .this_id = 16, 680 .this_id = 16,
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index e9920a009593..eb8bc6822cc1 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -1348,20 +1348,6 @@ static int aha1542_restart(struct Scsi_Host *shost)
1348 return 0; 1348 return 0;
1349} 1349}
1350 1350
1351static int aha1542_abort(Scsi_Cmnd * SCpnt)
1352{
1353
1354 /*
1355 * The abort command does not leave the device in a clean state where
1356 * it is available to be used again. Until this gets worked out, we
1357 * will leave it commented out.
1358 */
1359
1360 printk(KERN_ERR "aha1542.c: Unable to abort command for target %d\n",
1361 SCpnt->device->id);
1362 return FAILED;
1363}
1364
1365/* 1351/*
1366 * This is a device reset. This is handled by sending a special command 1352 * This is a device reset. This is handled by sending a special command
1367 * to the device. 1353 * to the device.
@@ -1817,7 +1803,6 @@ static Scsi_Host_Template driver_template = {
1817 .detect = aha1542_detect, 1803 .detect = aha1542_detect,
1818 .release = aha1542_release, 1804 .release = aha1542_release,
1819 .queuecommand = aha1542_queuecommand, 1805 .queuecommand = aha1542_queuecommand,
1820 .eh_abort_handler = aha1542_abort,
1821 .eh_device_reset_handler= aha1542_dev_reset, 1806 .eh_device_reset_handler= aha1542_dev_reset,
1822 .eh_bus_reset_handler = aha1542_bus_reset, 1807 .eh_bus_reset_handler = aha1542_bus_reset,
1823 .eh_host_reset_handler = aha1542_host_reset, 1808 .eh_host_reset_handler = aha1542_host_reset,
diff --git a/drivers/scsi/aha1542.h b/drivers/scsi/aha1542.h
index c402351dc79a..3821ee17f471 100644
--- a/drivers/scsi/aha1542.h
+++ b/drivers/scsi/aha1542.h
@@ -133,7 +133,6 @@ struct ccb { /* Command Control Block 5.3 */
133 133
134static int aha1542_detect(Scsi_Host_Template *); 134static int aha1542_detect(Scsi_Host_Template *);
135static int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 135static int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
136static int aha1542_abort(Scsi_Cmnd * SCpnt);
137static int aha1542_bus_reset(Scsi_Cmnd * SCpnt); 136static int aha1542_bus_reset(Scsi_Cmnd * SCpnt);
138static int aha1542_dev_reset(Scsi_Cmnd * SCpnt); 137static int aha1542_dev_reset(Scsi_Cmnd * SCpnt);
139static int aha1542_host_reset(Scsi_Cmnd * SCpnt); 138static int aha1542_host_reset(Scsi_Cmnd * SCpnt);
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index 27271bfc01d7..26498553a7cc 100644
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -244,9 +244,7 @@ static Scsi_Host_Template cumanascsi_template = {
244 .info = cumanascsi_info, 244 .info = cumanascsi_info,
245 .queuecommand = cumanascsi_queue_command, 245 .queuecommand = cumanascsi_queue_command,
246 .eh_abort_handler = NCR5380_abort, 246 .eh_abort_handler = NCR5380_abort,
247 .eh_device_reset_handler= NCR5380_device_reset,
248 .eh_bus_reset_handler = NCR5380_bus_reset, 247 .eh_bus_reset_handler = NCR5380_bus_reset,
249 .eh_host_reset_handler = NCR5380_host_reset,
250 .can_queue = 16, 248 .can_queue = 16,
251 .this_id = 7, 249 .this_id = 7,
252 .sg_tablesize = SG_ALL, 250 .sg_tablesize = SG_ALL,
diff --git a/drivers/scsi/arm/ecoscsi.c b/drivers/scsi/arm/ecoscsi.c
index 303648a84709..f8a7fdd3c465 100644
--- a/drivers/scsi/arm/ecoscsi.c
+++ b/drivers/scsi/arm/ecoscsi.c
@@ -162,9 +162,7 @@ static Scsi_Host_Template ecoscsi_template = {
162 .info = ecoscsi_info, 162 .info = ecoscsi_info,
163 .queuecommand = ecoscsi_queue_command, 163 .queuecommand = ecoscsi_queue_command,
164 .eh_abort_handler = NCR5380_abort, 164 .eh_abort_handler = NCR5380_abort,
165 .eh_device_reset_handler= NCR5380_device_reset,
166 .eh_bus_reset_handler = NCR5380_bus_reset, 165 .eh_bus_reset_handler = NCR5380_bus_reset,
167 .eh_host_reset_handler = NCR5380_host_reset,
168 .can_queue = 16, 166 .can_queue = 16,
169 .this_id = 7, 167 .this_id = 7,
170 .sg_tablesize = SG_ALL, 168 .sg_tablesize = SG_ALL,
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index ff2554f4cb80..de24bb991f1d 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -118,9 +118,7 @@ static Scsi_Host_Template oakscsi_template = {
118 .info = oakscsi_info, 118 .info = oakscsi_info,
119 .queuecommand = oakscsi_queue_command, 119 .queuecommand = oakscsi_queue_command,
120 .eh_abort_handler = NCR5380_abort, 120 .eh_abort_handler = NCR5380_abort,
121 .eh_device_reset_handler= NCR5380_device_reset,
122 .eh_bus_reset_handler = NCR5380_bus_reset, 121 .eh_bus_reset_handler = NCR5380_bus_reset,
123 .eh_host_reset_handler = NCR5380_host_reset,
124 .can_queue = 16, 122 .can_queue = 16,
125 .this_id = 7, 123 .this_id = 7,
126 .sg_tablesize = SG_ALL, 124 .sg_tablesize = SG_ALL,
diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index 1d2242403db8..7905b904e01d 100644
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -61,8 +61,6 @@ static struct scsi_host_template dmx3191d_driver_template = {
61 .queuecommand = NCR5380_queue_command, 61 .queuecommand = NCR5380_queue_command,
62 .eh_abort_handler = NCR5380_abort, 62 .eh_abort_handler = NCR5380_abort,
63 .eh_bus_reset_handler = NCR5380_bus_reset, 63 .eh_bus_reset_handler = NCR5380_bus_reset,
64 .eh_device_reset_handler= NCR5380_device_reset,
65 .eh_host_reset_handler = NCR5380_host_reset,
66 .can_queue = 32, 64 .can_queue = 32,
67 .this_id = 7, 65 .this_id = 7,
68 .sg_tablesize = SG_ALL, 66 .sg_tablesize = SG_ALL,
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c
index da1aaa413fed..ab9de39bb50b 100644
--- a/drivers/scsi/dtc.c
+++ b/drivers/scsi/dtc.c
@@ -482,8 +482,6 @@ static Scsi_Host_Template driver_template = {
482 .queuecommand = dtc_queue_command, 482 .queuecommand = dtc_queue_command,
483 .eh_abort_handler = dtc_abort, 483 .eh_abort_handler = dtc_abort,
484 .eh_bus_reset_handler = dtc_bus_reset, 484 .eh_bus_reset_handler = dtc_bus_reset,
485 .eh_device_reset_handler = dtc_device_reset,
486 .eh_host_reset_handler = dtc_host_reset,
487 .bios_param = dtc_biosparam, 485 .bios_param = dtc_biosparam,
488 .can_queue = CAN_QUEUE, 486 .can_queue = CAN_QUEUE,
489 .this_id = 7, 487 .this_id = 7,
diff --git a/drivers/scsi/dtc.h b/drivers/scsi/dtc.h
index c4bcdbf338a2..ed73629eb2f9 100644
--- a/drivers/scsi/dtc.h
+++ b/drivers/scsi/dtc.h
@@ -34,8 +34,6 @@ static int dtc_biosparam(struct scsi_device *, struct block_device *,
34static int dtc_detect(Scsi_Host_Template *); 34static int dtc_detect(Scsi_Host_Template *);
35static int dtc_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 35static int dtc_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
36static int dtc_bus_reset(Scsi_Cmnd *); 36static int dtc_bus_reset(Scsi_Cmnd *);
37static int dtc_device_reset(Scsi_Cmnd *);
38static int dtc_host_reset(Scsi_Cmnd *);
39 37
40#ifndef CMD_PER_LUN 38#ifndef CMD_PER_LUN
41#define CMD_PER_LUN 2 39#define CMD_PER_LUN 2
@@ -86,8 +84,6 @@ static int dtc_host_reset(Scsi_Cmnd *);
86#define NCR5380_queue_command dtc_queue_command 84#define NCR5380_queue_command dtc_queue_command
87#define NCR5380_abort dtc_abort 85#define NCR5380_abort dtc_abort
88#define NCR5380_bus_reset dtc_bus_reset 86#define NCR5380_bus_reset dtc_bus_reset
89#define NCR5380_device_reset dtc_device_reset
90#define NCR5380_host_reset dtc_host_reset
91#define NCR5380_proc_info dtc_proc_info 87#define NCR5380_proc_info dtc_proc_info
92 88
93/* 15 12 11 10 89/* 15 12 11 10
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 81d16cfbe69e..8394529ba552 100644
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -518,8 +518,6 @@ static struct scsi_host_template driver_template = {
518 .release = eata2x_release, 518 .release = eata2x_release,
519 .queuecommand = eata2x_queuecommand, 519 .queuecommand = eata2x_queuecommand,
520 .eh_abort_handler = eata2x_eh_abort, 520 .eh_abort_handler = eata2x_eh_abort,
521 .eh_device_reset_handler = NULL,
522 .eh_bus_reset_handler = NULL,
523 .eh_host_reset_handler = eata2x_eh_host_reset, 521 .eh_host_reset_handler = eata2x_eh_host_reset,
524 .bios_param = eata2x_bios_param, 522 .bios_param = eata2x_bios_param,
525 .slave_configure = eata2x_slave_configure, 523 .slave_configure = eata2x_slave_configure,
diff --git a/drivers/scsi/fcal.c b/drivers/scsi/fcal.c
index 0dad89d4cb3e..a6f120dcdfc3 100644
--- a/drivers/scsi/fcal.c
+++ b/drivers/scsi/fcal.c
@@ -311,7 +311,6 @@ static Scsi_Host_Template driver_template = {
311 .use_clustering = ENABLE_CLUSTERING, 311 .use_clustering = ENABLE_CLUSTERING,
312 .eh_abort_handler = fcp_scsi_abort, 312 .eh_abort_handler = fcp_scsi_abort,
313 .eh_device_reset_handler = fcp_scsi_dev_reset, 313 .eh_device_reset_handler = fcp_scsi_dev_reset,
314 .eh_bus_reset_handler = fcp_scsi_bus_reset,
315 .eh_host_reset_handler = fcp_scsi_host_reset, 314 .eh_host_reset_handler = fcp_scsi_host_reset,
316}; 315};
317#include "scsi_module.c" 316#include "scsi_module.c"
diff --git a/drivers/scsi/fd_mcs.c b/drivers/scsi/fd_mcs.c
index 770930e2aec3..4a358aec2e59 100644
--- a/drivers/scsi/fd_mcs.c
+++ b/drivers/scsi/fd_mcs.c
@@ -1241,16 +1241,6 @@ static int fd_mcs_abort(Scsi_Cmnd * SCpnt)
1241 return SUCCESS; 1241 return SUCCESS;
1242} 1242}
1243 1243
1244static int fd_mcs_host_reset(Scsi_Cmnd * SCpnt)
1245{
1246 return FAILED;
1247}
1248
1249static int fd_mcs_device_reset(Scsi_Cmnd * SCpnt)
1250{
1251 return FAILED;
1252}
1253
1254static int fd_mcs_bus_reset(Scsi_Cmnd * SCpnt) { 1244static int fd_mcs_bus_reset(Scsi_Cmnd * SCpnt) {
1255 struct Scsi_Host *shpnt = SCpnt->device->host; 1245 struct Scsi_Host *shpnt = SCpnt->device->host;
1256 1246
@@ -1357,8 +1347,6 @@ static Scsi_Host_Template driver_template = {
1357 .queuecommand = fd_mcs_queue, 1347 .queuecommand = fd_mcs_queue,
1358 .eh_abort_handler = fd_mcs_abort, 1348 .eh_abort_handler = fd_mcs_abort,
1359 .eh_bus_reset_handler = fd_mcs_bus_reset, 1349 .eh_bus_reset_handler = fd_mcs_bus_reset,
1360 .eh_host_reset_handler = fd_mcs_host_reset,
1361 .eh_device_reset_handler = fd_mcs_device_reset,
1362 .bios_param = fd_mcs_biosparam, 1350 .bios_param = fd_mcs_biosparam,
1363 .can_queue = 1, 1351 .can_queue = 1,
1364 .this_id = 7, 1352 .this_id = 7,
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index ca9d5bd26ca3..a3aa729b9d3c 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -908,8 +908,6 @@ static Scsi_Host_Template driver_template = {
908 .queuecommand = generic_NCR5380_queue_command, 908 .queuecommand = generic_NCR5380_queue_command,
909 .eh_abort_handler = generic_NCR5380_abort, 909 .eh_abort_handler = generic_NCR5380_abort,
910 .eh_bus_reset_handler = generic_NCR5380_bus_reset, 910 .eh_bus_reset_handler = generic_NCR5380_bus_reset,
911 .eh_device_reset_handler = generic_NCR5380_device_reset,
912 .eh_host_reset_handler = generic_NCR5380_host_reset,
913 .bios_param = NCR5380_BIOSPARAM, 911 .bios_param = NCR5380_BIOSPARAM,
914 .can_queue = CAN_QUEUE, 912 .can_queue = CAN_QUEUE,
915 .this_id = 7, 913 .this_id = 7,
diff --git a/drivers/scsi/g_NCR5380.h b/drivers/scsi/g_NCR5380.h
index 0c04cefb2a88..c8adc5a94884 100644
--- a/drivers/scsi/g_NCR5380.h
+++ b/drivers/scsi/g_NCR5380.h
@@ -49,8 +49,6 @@ static int generic_NCR5380_detect(Scsi_Host_Template *);
49static int generic_NCR5380_release_resources(struct Scsi_Host *); 49static int generic_NCR5380_release_resources(struct Scsi_Host *);
50static int generic_NCR5380_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 50static int generic_NCR5380_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
51static int generic_NCR5380_bus_reset(Scsi_Cmnd *); 51static int generic_NCR5380_bus_reset(Scsi_Cmnd *);
52static int generic_NCR5380_host_reset(Scsi_Cmnd *);
53static int generic_NCR5380_device_reset(Scsi_Cmnd *);
54static const char* generic_NCR5380_info(struct Scsi_Host *); 52static const char* generic_NCR5380_info(struct Scsi_Host *);
55 53
56#ifndef CMD_PER_LUN 54#ifndef CMD_PER_LUN
@@ -114,8 +112,6 @@ static const char* generic_NCR5380_info(struct Scsi_Host *);
114#define NCR5380_queue_command generic_NCR5380_queue_command 112#define NCR5380_queue_command generic_NCR5380_queue_command
115#define NCR5380_abort generic_NCR5380_abort 113#define NCR5380_abort generic_NCR5380_abort
116#define NCR5380_bus_reset generic_NCR5380_bus_reset 114#define NCR5380_bus_reset generic_NCR5380_bus_reset
117#define NCR5380_device_reset generic_NCR5380_device_reset
118#define NCR5380_host_reset generic_NCR5380_host_reset
119#define NCR5380_pread generic_NCR5380_pread 115#define NCR5380_pread generic_NCR5380_pread
120#define NCR5380_pwrite generic_NCR5380_pwrite 116#define NCR5380_pwrite generic_NCR5380_pwrite
121#define NCR5380_proc_info notyet_generic_proc_info 117#define NCR5380_proc_info notyet_generic_proc_info
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index a9eaab9fbd5e..4552cccd2834 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -4703,19 +4703,6 @@ static const char *gdth_info(struct Scsi_Host *shp)
4703 return ((const char *)ha->binfo.type_string); 4703 return ((const char *)ha->binfo.type_string);
4704} 4704}
4705 4705
4706/* new error handling */
4707static int gdth_eh_abort(Scsi_Cmnd *scp)
4708{
4709 TRACE2(("gdth_eh_abort()\n"));
4710 return FAILED;
4711}
4712
4713static int gdth_eh_device_reset(Scsi_Cmnd *scp)
4714{
4715 TRACE2(("gdth_eh_device_reset()\n"));
4716 return FAILED;
4717}
4718
4719static int gdth_eh_bus_reset(Scsi_Cmnd *scp) 4706static int gdth_eh_bus_reset(Scsi_Cmnd *scp)
4720{ 4707{
4721 int i, hanum; 4708 int i, hanum;
@@ -4770,13 +4757,6 @@ static int gdth_eh_bus_reset(Scsi_Cmnd *scp)
4770 return SUCCESS; 4757 return SUCCESS;
4771} 4758}
4772 4759
4773static int gdth_eh_host_reset(Scsi_Cmnd *scp)
4774{
4775 TRACE2(("gdth_eh_host_reset()\n"));
4776 return FAILED;
4777}
4778
4779
4780#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) 4760#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
4781static int gdth_bios_param(struct scsi_device *sdev,struct block_device *bdev,sector_t cap,int *ip) 4761static int gdth_bios_param(struct scsi_device *sdev,struct block_device *bdev,sector_t cap,int *ip)
4782#else 4762#else
@@ -5713,10 +5693,7 @@ static Scsi_Host_Template driver_template = {
5713 .release = gdth_release, 5693 .release = gdth_release,
5714 .info = gdth_info, 5694 .info = gdth_info,
5715 .queuecommand = gdth_queuecommand, 5695 .queuecommand = gdth_queuecommand,
5716 .eh_abort_handler = gdth_eh_abort,
5717 .eh_device_reset_handler = gdth_eh_device_reset,
5718 .eh_bus_reset_handler = gdth_eh_bus_reset, 5696 .eh_bus_reset_handler = gdth_eh_bus_reset,
5719 .eh_host_reset_handler = gdth_eh_host_reset,
5720 .bios_param = gdth_bios_param, 5697 .bios_param = gdth_bios_param,
5721 .can_queue = GDTH_MAXCMDS, 5698 .can_queue = GDTH_MAXCMDS,
5722 .this_id = -1, 5699 .this_id = -1,
diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c
index 0bb0369efb2d..e1fe6f13b829 100644
--- a/drivers/scsi/in2000.c
+++ b/drivers/scsi/in2000.c
@@ -1671,17 +1671,6 @@ static int in2000_bus_reset(Scsi_Cmnd * cmd)
1671 return SUCCESS; 1671 return SUCCESS;
1672} 1672}
1673 1673
1674static int in2000_host_reset(Scsi_Cmnd * cmd)
1675{
1676 return FAILED;
1677}
1678
1679static int in2000_device_reset(Scsi_Cmnd * cmd)
1680{
1681 return FAILED;
1682}
1683
1684
1685static int in2000_abort(Scsi_Cmnd * cmd) 1674static int in2000_abort(Scsi_Cmnd * cmd)
1686{ 1675{
1687 struct Scsi_Host *instance; 1676 struct Scsi_Host *instance;
@@ -2311,8 +2300,6 @@ static Scsi_Host_Template driver_template = {
2311 .queuecommand = in2000_queuecommand, 2300 .queuecommand = in2000_queuecommand,
2312 .eh_abort_handler = in2000_abort, 2301 .eh_abort_handler = in2000_abort,
2313 .eh_bus_reset_handler = in2000_bus_reset, 2302 .eh_bus_reset_handler = in2000_bus_reset,
2314 .eh_device_reset_handler = in2000_device_reset,
2315 .eh_host_reset_handler = in2000_host_reset,
2316 .bios_param = in2000_biosparam, 2303 .bios_param = in2000_biosparam,
2317 .can_queue = IN2000_CAN_Q, 2304 .can_queue = IN2000_CAN_Q,
2318 .this_id = IN2000_HOST_ID, 2305 .this_id = IN2000_HOST_ID,
diff --git a/drivers/scsi/in2000.h b/drivers/scsi/in2000.h
index 019e45df3016..a240b52554d8 100644
--- a/drivers/scsi/in2000.h
+++ b/drivers/scsi/in2000.h
@@ -401,9 +401,7 @@ static int in2000_abort(Scsi_Cmnd *);
401static void in2000_setup(char *, int *) in2000__INIT; 401static void in2000_setup(char *, int *) in2000__INIT;
402static int in2000_biosparam(struct scsi_device *, struct block_device *, 402static int in2000_biosparam(struct scsi_device *, struct block_device *,
403 sector_t, int *); 403 sector_t, int *);
404static int in2000_host_reset(Scsi_Cmnd *);
405static int in2000_bus_reset(Scsi_Cmnd *); 404static int in2000_bus_reset(Scsi_Cmnd *);
406static int in2000_device_reset(Scsi_Cmnd *);
407 405
408 406
409#define IN2000_CAN_Q 16 407#define IN2000_CAN_Q 16
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index 3ef2a1443996..9a792a5494b5 100644
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -98,11 +98,6 @@ static int mac53c94_queue(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *
98 return 0; 98 return 0;
99} 99}
100 100
101static int mac53c94_abort(struct scsi_cmnd *cmd)
102{
103 return FAILED;
104}
105
106static int mac53c94_host_reset(struct scsi_cmnd *cmd) 101static int mac53c94_host_reset(struct scsi_cmnd *cmd)
107{ 102{
108 struct fsc_state *state = (struct fsc_state *) cmd->device->host->hostdata; 103 struct fsc_state *state = (struct fsc_state *) cmd->device->host->hostdata;
@@ -416,7 +411,6 @@ static struct scsi_host_template mac53c94_template = {
416 .proc_name = "53c94", 411 .proc_name = "53c94",
417 .name = "53C94", 412 .name = "53C94",
418 .queuecommand = mac53c94_queue, 413 .queuecommand = mac53c94_queue,
419 .eh_abort_handler = mac53c94_abort,
420 .eh_host_reset_handler = mac53c94_host_reset, 414 .eh_host_reset_handler = mac53c94_host_reset,
421 .can_queue = 1, 415 .can_queue = 1,
422 .this_id = 7, 416 .this_id = 7,
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index d5fd17ef74db..92d2c8379abf 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -591,8 +591,6 @@ static Scsi_Host_Template driver_template = {
591 .queuecommand = macscsi_queue_command, 591 .queuecommand = macscsi_queue_command,
592 .eh_abort_handler = macscsi_abort, 592 .eh_abort_handler = macscsi_abort,
593 .eh_bus_reset_handler = macscsi_bus_reset, 593 .eh_bus_reset_handler = macscsi_bus_reset,
594 .eh_device_reset_handler = macscsi_device_reset,
595 .eh_host_reset_handler = macscsi_host_reset,
596 .can_queue = CAN_QUEUE, 594 .can_queue = CAN_QUEUE,
597 .this_id = 7, 595 .this_id = 7,
598 .sg_tablesize = SG_ALL, 596 .sg_tablesize = SG_ALL,
diff --git a/drivers/scsi/mac_scsi.h b/drivers/scsi/mac_scsi.h
index 23ab2c18a016..d26e331c6c12 100644
--- a/drivers/scsi/mac_scsi.h
+++ b/drivers/scsi/mac_scsi.h
@@ -72,8 +72,6 @@
72#define NCR5380_queue_command macscsi_queue_command 72#define NCR5380_queue_command macscsi_queue_command
73#define NCR5380_abort macscsi_abort 73#define NCR5380_abort macscsi_abort
74#define NCR5380_bus_reset macscsi_bus_reset 74#define NCR5380_bus_reset macscsi_bus_reset
75#define NCR5380_device_reset macscsi_device_reset
76#define NCR5380_host_reset macscsi_host_reset
77#define NCR5380_proc_info macscsi_proc_info 75#define NCR5380_proc_info macscsi_proc_info
78 76
79#define BOARD_NORMAL 0 77#define BOARD_NORMAL 0
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index d28c0d99c344..029cef4ad694 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -294,7 +294,6 @@ static struct scsi_host_template nsp32_template = {
294 .this_id = NSP32_HOST_SCSIID, 294 .this_id = NSP32_HOST_SCSIID,
295 .use_clustering = DISABLE_CLUSTERING, 295 .use_clustering = DISABLE_CLUSTERING,
296 .eh_abort_handler = nsp32_eh_abort, 296 .eh_abort_handler = nsp32_eh_abort,
297/* .eh_device_reset_handler = NULL, */
298 .eh_bus_reset_handler = nsp32_eh_bus_reset, 297 .eh_bus_reset_handler = nsp32_eh_bus_reset,
299 .eh_host_reset_handler = nsp32_eh_host_reset, 298 .eh_host_reset_handler = nsp32_eh_host_reset,
300#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,74)) 299#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,74))
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index 7976947c0322..363e0ebd4a39 100644
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -621,8 +621,6 @@ static Scsi_Host_Template driver_template = {
621 .queuecommand = pas16_queue_command, 621 .queuecommand = pas16_queue_command,
622 .eh_abort_handler = pas16_abort, 622 .eh_abort_handler = pas16_abort,
623 .eh_bus_reset_handler = pas16_bus_reset, 623 .eh_bus_reset_handler = pas16_bus_reset,
624 .eh_device_reset_handler = pas16_device_reset,
625 .eh_host_reset_handler = pas16_host_reset,
626 .bios_param = pas16_biosparam, 624 .bios_param = pas16_biosparam,
627 .can_queue = CAN_QUEUE, 625 .can_queue = CAN_QUEUE,
628 .this_id = 7, 626 .this_id = 7,
diff --git a/drivers/scsi/pas16.h b/drivers/scsi/pas16.h
index 58d4d67aed24..65ce1cc40d9a 100644
--- a/drivers/scsi/pas16.h
+++ b/drivers/scsi/pas16.h
@@ -120,8 +120,6 @@ static int pas16_biosparam(struct scsi_device *, struct block_device *,
120static int pas16_detect(Scsi_Host_Template *); 120static int pas16_detect(Scsi_Host_Template *);
121static int pas16_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 121static int pas16_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
122static int pas16_bus_reset(Scsi_Cmnd *); 122static int pas16_bus_reset(Scsi_Cmnd *);
123static int pas16_host_reset(Scsi_Cmnd *);
124static int pas16_device_reset(Scsi_Cmnd *);
125 123
126#ifndef CMD_PER_LUN 124#ifndef CMD_PER_LUN
127#define CMD_PER_LUN 2 125#define CMD_PER_LUN 2
@@ -164,9 +162,7 @@ static int pas16_device_reset(Scsi_Cmnd *);
164#define do_NCR5380_intr do_pas16_intr 162#define do_NCR5380_intr do_pas16_intr
165#define NCR5380_queue_command pas16_queue_command 163#define NCR5380_queue_command pas16_queue_command
166#define NCR5380_abort pas16_abort 164#define NCR5380_abort pas16_abort
167#define NCR5380_device_reset pas16_device_reset
168#define NCR5380_bus_reset pas16_bus_reset 165#define NCR5380_bus_reset pas16_bus_reset
169#define NCR5380_host_reset pas16_host_reset
170#define NCR5380_proc_info pas16_proc_info 166#define NCR5380_proc_info pas16_proc_info
171 167
172/* 15 14 12 10 7 5 3 168/* 15 14 12 10 7 5 3
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 496c412c8854..3dddb323e718 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -92,9 +92,7 @@ static Scsi_Host_Template nsp_driver_template = {
92#endif 92#endif
93 .info = nsp_info, 93 .info = nsp_info,
94 .queuecommand = nsp_queuecommand, 94 .queuecommand = nsp_queuecommand,
95/* .eh_strategy_handler = nsp_eh_strategy,*/
96/* .eh_abort_handler = nsp_eh_abort,*/ 95/* .eh_abort_handler = nsp_eh_abort,*/
97/* .eh_device_reset_handler = nsp_eh_device_reset,*/
98 .eh_bus_reset_handler = nsp_eh_bus_reset, 96 .eh_bus_reset_handler = nsp_eh_bus_reset,
99 .eh_host_reset_handler = nsp_eh_host_reset, 97 .eh_host_reset_handler = nsp_eh_host_reset,
100 .can_queue = 1, 98 .can_queue = 1,
@@ -1536,11 +1534,6 @@ nsp_proc_info(
1536/* error handler */ 1534/* error handler */
1537/*---------------------------------------------------------------*/ 1535/*---------------------------------------------------------------*/
1538 1536
1539/*static int nsp_eh_strategy(struct Scsi_Host *Shost)
1540{
1541 return FAILED;
1542}*/
1543
1544/* 1537/*
1545static int nsp_eh_abort(Scsi_Cmnd *SCpnt) 1538static int nsp_eh_abort(Scsi_Cmnd *SCpnt)
1546{ 1539{
@@ -1549,14 +1542,6 @@ static int nsp_eh_abort(Scsi_Cmnd *SCpnt)
1549 return nsp_eh_bus_reset(SCpnt); 1542 return nsp_eh_bus_reset(SCpnt);
1550}*/ 1543}*/
1551 1544
1552/*
1553static int nsp_eh_device_reset(Scsi_Cmnd *SCpnt)
1554{
1555 nsp_dbg(NSP_DEBUG_BUSRESET, "%s: SCpnt=0x%p", SCpnt);
1556
1557 return FAILED;
1558}*/
1559
1560static int nsp_bus_reset(nsp_hw_data *data) 1545static int nsp_bus_reset(nsp_hw_data *data)
1561{ 1546{
1562 unsigned int base = data->BaseAddress; 1547 unsigned int base = data->BaseAddress;
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 4766bcd63692..a0175f5d11cd 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -81,8 +81,6 @@ static Scsi_Host_Template qlogicfas_driver_template = {
81 .queuecommand = qlogicfas408_queuecommand, 81 .queuecommand = qlogicfas408_queuecommand,
82 .eh_abort_handler = qlogicfas408_abort, 82 .eh_abort_handler = qlogicfas408_abort,
83 .eh_bus_reset_handler = qlogicfas408_bus_reset, 83 .eh_bus_reset_handler = qlogicfas408_bus_reset,
84 .eh_device_reset_handler= qlogicfas408_device_reset,
85 .eh_host_reset_handler = qlogicfas408_host_reset,
86 .bios_param = qlogicfas408_biosparam, 84 .bios_param = qlogicfas408_biosparam,
87 .can_queue = 1, 85 .can_queue = 1,
88 .this_id = -1, 86 .this_id = -1,
diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c
index c01b7191fcf5..623082d3a83f 100644
--- a/drivers/scsi/pluto.c
+++ b/drivers/scsi/pluto.c
@@ -354,7 +354,6 @@ static Scsi_Host_Template driver_template = {
354 .use_clustering = ENABLE_CLUSTERING, 354 .use_clustering = ENABLE_CLUSTERING,
355 .eh_abort_handler = fcp_scsi_abort, 355 .eh_abort_handler = fcp_scsi_abort,
356 .eh_device_reset_handler = fcp_scsi_dev_reset, 356 .eh_device_reset_handler = fcp_scsi_dev_reset,
357 .eh_bus_reset_handler = fcp_scsi_bus_reset,
358 .eh_host_reset_handler = fcp_scsi_host_reset, 357 .eh_host_reset_handler = fcp_scsi_host_reset,
359}; 358};
360 359
diff --git a/drivers/scsi/qlogicfas.c b/drivers/scsi/qlogicfas.c
index a1adb38f69bb..55e698b651d6 100644
--- a/drivers/scsi/qlogicfas.c
+++ b/drivers/scsi/qlogicfas.c
@@ -191,8 +191,6 @@ static Scsi_Host_Template qlogicfas_driver_template = {
191 .queuecommand = qlogicfas408_queuecommand, 191 .queuecommand = qlogicfas408_queuecommand,
192 .eh_abort_handler = qlogicfas408_abort, 192 .eh_abort_handler = qlogicfas408_abort,
193 .eh_bus_reset_handler = qlogicfas408_bus_reset, 193 .eh_bus_reset_handler = qlogicfas408_bus_reset,
194 .eh_device_reset_handler= qlogicfas408_device_reset,
195 .eh_host_reset_handler = qlogicfas408_host_reset,
196 .bios_param = qlogicfas408_biosparam, 194 .bios_param = qlogicfas408_biosparam,
197 .can_queue = 1, 195 .can_queue = 1,
198 .this_id = -1, 196 .this_id = -1,
diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c
index 5b6ce0a88f08..575f8a8fcf34 100644
--- a/drivers/scsi/qlogicfas408.c
+++ b/drivers/scsi/qlogicfas408.c
@@ -516,24 +516,6 @@ int qlogicfas408_bus_reset(Scsi_Cmnd * cmd)
516 return SUCCESS; 516 return SUCCESS;
517} 517}
518 518
519/*
520 * Reset SCSI host controller
521 */
522
523int qlogicfas408_host_reset(Scsi_Cmnd * cmd)
524{
525 return FAILED;
526}
527
528/*
529 * Reset SCSI device
530 */
531
532int qlogicfas408_device_reset(Scsi_Cmnd * cmd)
533{
534 return FAILED;
535}
536
537/* 519/*
538 * Return info string 520 * Return info string
539 */ 521 */
@@ -626,8 +608,6 @@ EXPORT_SYMBOL(qlogicfas408_info);
626EXPORT_SYMBOL(qlogicfas408_queuecommand); 608EXPORT_SYMBOL(qlogicfas408_queuecommand);
627EXPORT_SYMBOL(qlogicfas408_abort); 609EXPORT_SYMBOL(qlogicfas408_abort);
628EXPORT_SYMBOL(qlogicfas408_bus_reset); 610EXPORT_SYMBOL(qlogicfas408_bus_reset);
629EXPORT_SYMBOL(qlogicfas408_device_reset);
630EXPORT_SYMBOL(qlogicfas408_host_reset);
631EXPORT_SYMBOL(qlogicfas408_biosparam); 611EXPORT_SYMBOL(qlogicfas408_biosparam);
632EXPORT_SYMBOL(qlogicfas408_ihandl); 612EXPORT_SYMBOL(qlogicfas408_ihandl);
633EXPORT_SYMBOL(qlogicfas408_get_chip_type); 613EXPORT_SYMBOL(qlogicfas408_get_chip_type);
diff --git a/drivers/scsi/qlogicfas408.h b/drivers/scsi/qlogicfas408.h
index f01cbd66c224..4b3df2003660 100644
--- a/drivers/scsi/qlogicfas408.h
+++ b/drivers/scsi/qlogicfas408.h
@@ -109,8 +109,6 @@ int qlogicfas408_biosparam(struct scsi_device * disk,
109 sector_t capacity, int ip[]); 109 sector_t capacity, int ip[]);
110int qlogicfas408_abort(Scsi_Cmnd * cmd); 110int qlogicfas408_abort(Scsi_Cmnd * cmd);
111int qlogicfas408_bus_reset(Scsi_Cmnd * cmd); 111int qlogicfas408_bus_reset(Scsi_Cmnd * cmd);
112int qlogicfas408_host_reset(Scsi_Cmnd * cmd);
113int qlogicfas408_device_reset(Scsi_Cmnd * cmd);
114const char *qlogicfas408_info(struct Scsi_Host *host); 112const char *qlogicfas408_info(struct Scsi_Host *host);
115int qlogicfas408_get_chip_type(int qbase, int int_type); 113int qlogicfas408_get_chip_type(int qbase, int int_type);
116void qlogicfas408_setup(int qbase, int id, int int_type); 114void qlogicfas408_setup(int qbase, int id, int int_type);
diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c
index 4c95abb54057..ae9fdb52847b 100644
--- a/drivers/scsi/seagate.c
+++ b/drivers/scsi/seagate.c
@@ -1640,16 +1640,6 @@ static int seagate_st0x_bus_reset(Scsi_Cmnd * SCpnt)
1640 return SUCCESS; 1640 return SUCCESS;
1641} 1641}
1642 1642
1643static int seagate_st0x_host_reset(Scsi_Cmnd *SCpnt)
1644{
1645 return FAILED;
1646}
1647
1648static int seagate_st0x_device_reset(Scsi_Cmnd *SCpnt)
1649{
1650 return FAILED;
1651}
1652
1653static int seagate_st0x_release(struct Scsi_Host *shost) 1643static int seagate_st0x_release(struct Scsi_Host *shost)
1654{ 1644{
1655 if (shost->irq) 1645 if (shost->irq)
@@ -1665,8 +1655,6 @@ static Scsi_Host_Template driver_template = {
1665 .queuecommand = seagate_st0x_queue_command, 1655 .queuecommand = seagate_st0x_queue_command,
1666 .eh_abort_handler = seagate_st0x_abort, 1656 .eh_abort_handler = seagate_st0x_abort,
1667 .eh_bus_reset_handler = seagate_st0x_bus_reset, 1657 .eh_bus_reset_handler = seagate_st0x_bus_reset,
1668 .eh_host_reset_handler = seagate_st0x_host_reset,
1669 .eh_device_reset_handler = seagate_st0x_device_reset,
1670 .can_queue = 1, 1658 .can_queue = 1,
1671 .this_id = 7, 1659 .this_id = 7,
1672 .sg_tablesize = SG_ALL, 1660 .sg_tablesize = SG_ALL,
diff --git a/drivers/scsi/seagate.h b/drivers/scsi/seagate.h
index e49e8ecfb54d..8889ff1a6b20 100644
--- a/drivers/scsi/seagate.h
+++ b/drivers/scsi/seagate.h
@@ -15,7 +15,5 @@ static int seagate_st0x_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
15static int seagate_st0x_abort(Scsi_Cmnd *); 15static int seagate_st0x_abort(Scsi_Cmnd *);
16static const char *seagate_st0x_info(struct Scsi_Host *); 16static const char *seagate_st0x_info(struct Scsi_Host *);
17static int seagate_st0x_bus_reset(Scsi_Cmnd *); 17static int seagate_st0x_bus_reset(Scsi_Cmnd *);
18static int seagate_st0x_device_reset(Scsi_Cmnd *);
19static int seagate_st0x_host_reset(Scsi_Cmnd *);
20 18
21#endif /* _SEAGATE_H */ 19#endif /* _SEAGATE_H */
diff --git a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c
index ebfddd40ce67..ca9a04cf4d3f 100644
--- a/drivers/scsi/sym53c416.c
+++ b/drivers/scsi/sym53c416.c
@@ -785,21 +785,6 @@ int sym53c416_queuecommand(Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
785 return 0; 785 return 0;
786} 786}
787 787
788static int sym53c416_abort(Scsi_Cmnd *SCpnt)
789{
790 return FAILED;
791}
792
793static int sym53c416_bus_reset(Scsi_Cmnd *SCpnt)
794{
795 return FAILED;
796}
797
798static int sym53c416_device_reset(Scsi_Cmnd *SCpnt)
799{
800 return FAILED;
801}
802
803static int sym53c416_host_reset(Scsi_Cmnd *SCpnt) 788static int sym53c416_host_reset(Scsi_Cmnd *SCpnt)
804{ 789{
805 int base; 790 int base;
@@ -865,10 +850,7 @@ static Scsi_Host_Template driver_template = {
865 .detect = sym53c416_detect, 850 .detect = sym53c416_detect,
866 .info = sym53c416_info, 851 .info = sym53c416_info,
867 .queuecommand = sym53c416_queuecommand, 852 .queuecommand = sym53c416_queuecommand,
868 .eh_abort_handler = sym53c416_abort,
869 .eh_host_reset_handler =sym53c416_host_reset, 853 .eh_host_reset_handler =sym53c416_host_reset,
870 .eh_bus_reset_handler = sym53c416_bus_reset,
871 .eh_device_reset_handler =sym53c416_device_reset,
872 .release = sym53c416_release, 854 .release = sym53c416_release,
873 .bios_param = sym53c416_bios_param, 855 .bios_param = sym53c416_bios_param,
874 .can_queue = 1, 856 .can_queue = 1,
diff --git a/drivers/scsi/sym53c416.h b/drivers/scsi/sym53c416.h
index 3c0e3f8301f1..fd6b120d38c4 100644
--- a/drivers/scsi/sym53c416.h
+++ b/drivers/scsi/sym53c416.h
@@ -26,10 +26,7 @@ static int sym53c416_detect(Scsi_Host_Template *);
26static const char *sym53c416_info(struct Scsi_Host *); 26static const char *sym53c416_info(struct Scsi_Host *);
27static int sym53c416_release(struct Scsi_Host *); 27static int sym53c416_release(struct Scsi_Host *);
28static int sym53c416_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 28static int sym53c416_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
29static int sym53c416_abort(Scsi_Cmnd *);
30static int sym53c416_host_reset(Scsi_Cmnd *); 29static int sym53c416_host_reset(Scsi_Cmnd *);
31static int sym53c416_bus_reset(Scsi_Cmnd *);
32static int sym53c416_device_reset(Scsi_Cmnd *);
33static int sym53c416_bios_param(struct scsi_device *, struct block_device *, 30static int sym53c416_bios_param(struct scsi_device *, struct block_device *,
34 sector_t, int *); 31 sector_t, int *);
35static void sym53c416_setup(char *str, int *ints); 32static void sym53c416_setup(char *str, int *ints);
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index 6dc2897672a1..f4b780e35cb6 100644
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -437,8 +437,6 @@ static Scsi_Host_Template driver_template = {
437 .queuecommand = t128_queue_command, 437 .queuecommand = t128_queue_command,
438 .eh_abort_handler = t128_abort, 438 .eh_abort_handler = t128_abort,
439 .eh_bus_reset_handler = t128_bus_reset, 439 .eh_bus_reset_handler = t128_bus_reset,
440 .eh_host_reset_handler = t128_host_reset,
441 .eh_device_reset_handler = t128_device_reset,
442 .bios_param = t128_biosparam, 440 .bios_param = t128_biosparam,
443 .can_queue = CAN_QUEUE, 441 .can_queue = CAN_QUEUE,
444 .this_id = 7, 442 .this_id = 7,
diff --git a/drivers/scsi/t128.h b/drivers/scsi/t128.h
index 161ba53d982b..9ad1d68827a7 100644
--- a/drivers/scsi/t128.h
+++ b/drivers/scsi/t128.h
@@ -96,9 +96,7 @@ static int t128_biosparam(struct scsi_device *, struct block_device *,
96 sector_t, int*); 96 sector_t, int*);
97static int t128_detect(Scsi_Host_Template *); 97static int t128_detect(Scsi_Host_Template *);
98static int t128_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 98static int t128_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
99static int t128_host_reset(Scsi_Cmnd *);
100static int t128_bus_reset(Scsi_Cmnd *); 99static int t128_bus_reset(Scsi_Cmnd *);
101static int t128_device_reset(Scsi_Cmnd *);
102 100
103#ifndef CMD_PER_LUN 101#ifndef CMD_PER_LUN
104#define CMD_PER_LUN 2 102#define CMD_PER_LUN 2
@@ -140,8 +138,6 @@ static int t128_device_reset(Scsi_Cmnd *);
140#define do_NCR5380_intr do_t128_intr 138#define do_NCR5380_intr do_t128_intr
141#define NCR5380_queue_command t128_queue_command 139#define NCR5380_queue_command t128_queue_command
142#define NCR5380_abort t128_abort 140#define NCR5380_abort t128_abort
143#define NCR5380_host_reset t128_host_reset
144#define NCR5380_device_reset t128_device_reset
145#define NCR5380_bus_reset t128_bus_reset 141#define NCR5380_bus_reset t128_bus_reset
146#define NCR5380_proc_info t128_proc_info 142#define NCR5380_proc_info t128_proc_info
147 143
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c
index dca215411f68..a6a441937acb 100644
--- a/drivers/scsi/u14-34f.c
+++ b/drivers/scsi/u14-34f.c
@@ -446,8 +446,6 @@ static struct scsi_host_template driver_template = {
446 .release = u14_34f_release, 446 .release = u14_34f_release,
447 .queuecommand = u14_34f_queuecommand, 447 .queuecommand = u14_34f_queuecommand,
448 .eh_abort_handler = u14_34f_eh_abort, 448 .eh_abort_handler = u14_34f_eh_abort,
449 .eh_device_reset_handler = NULL,
450 .eh_bus_reset_handler = NULL,
451 .eh_host_reset_handler = u14_34f_eh_host_reset, 449 .eh_host_reset_handler = u14_34f_eh_host_reset,
452 .bios_param = u14_34f_bios_param, 450 .bios_param = u14_34f_bios_param,
453 .slave_configure = u14_34f_slave_configure, 451 .slave_configure = u14_34f_slave_configure,