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

[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>

-261
-12
drivers/scsi/53c700.c
··· 170 170 STATIC int NCR_700_queuecommand(struct scsi_cmnd *, void (*done)(struct scsi_cmnd *)); 171 171 STATIC int NCR_700_abort(struct scsi_cmnd * SCpnt); 172 172 STATIC int NCR_700_bus_reset(struct scsi_cmnd * SCpnt); 173 - STATIC int NCR_700_dev_reset(struct scsi_cmnd * SCpnt); 174 173 STATIC int NCR_700_host_reset(struct scsi_cmnd * SCpnt); 175 174 STATIC void NCR_700_chip_setup(struct Scsi_Host *host); 176 175 STATIC void NCR_700_chip_reset(struct Scsi_Host *host); ··· 329 330 /* Fill in the missing routines from the host template */ 330 331 tpnt->queuecommand = NCR_700_queuecommand; 331 332 tpnt->eh_abort_handler = NCR_700_abort; 332 - tpnt->eh_device_reset_handler = NCR_700_dev_reset; 333 333 tpnt->eh_bus_reset_handler = NCR_700_bus_reset; 334 334 tpnt->eh_host_reset_handler = NCR_700_host_reset; 335 335 tpnt->can_queue = NCR_700_COMMAND_SLOTS_PER_HOST; ··· 1975 1977 if(hostdata->fast) 1976 1978 spi_schedule_dv_device(SCp->device); 1977 1979 return SUCCESS; 1978 - } 1979 - 1980 - STATIC int 1981 - NCR_700_dev_reset(struct scsi_cmnd * SCp) 1982 - { 1983 - printk(KERN_INFO "scsi%d (%d:%d) New error handler wants device reset\n\t", 1984 - SCp->device->host->host_no, SCp->device->id, SCp->device->lun); 1985 - scsi_print_command(SCp); 1986 - 1987 - return FAILED; 1988 1980 } 1989 1981 1990 1982 STATIC int
-28
drivers/scsi/NCR5380.c
··· 2833 2833 do_reset(cmd->device->host); 2834 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 - 2847 - static 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 - 2861 - static int NCR5380_host_reset(Scsi_Cmnd * cmd) { 2862 - return FAILED; 2863 - }
-2
drivers/scsi/NCR5380.h
··· 306 306 #endif 307 307 static int NCR5380_abort(Scsi_Cmnd * cmd); 308 308 static int NCR5380_bus_reset(Scsi_Cmnd * cmd); 309 - static int NCR5380_host_reset(Scsi_Cmnd * cmd); 310 - static int NCR5380_device_reset(Scsi_Cmnd * cmd); 311 309 static int NCR5380_queue_command(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)); 312 310 static int NCR5380_proc_info(struct Scsi_Host *instance, char *buffer, char **start, 313 311 off_t offset, int length, int inout);
-19
drivers/scsi/NCR53c406a.c
··· 722 722 return 0; 723 723 } 724 724 725 - static 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 - 731 725 static int NCR53c406a_host_reset(Scsi_Cmnd * SCpnt) 732 726 { 733 727 DEB(printk("NCR53c406a_reset called\n")); ··· 733 739 734 740 rtrc(2); 735 741 return SUCCESS; 736 - } 737 - 738 - static int NCR53c406a_device_reset(Scsi_Cmnd * SCpnt) 739 - { 740 - return FAILED; 741 - } 742 - 743 - static int NCR53c406a_bus_reset(Scsi_Cmnd * SCpnt) 744 - { 745 - return FAILED; 746 742 } 747 743 748 744 static int NCR53c406a_biosparm(struct scsi_device *disk, ··· 1059 1075 .release = NCR53c406a_release, 1060 1076 .info = NCR53c406a_info /* info */, 1061 1077 .queuecommand = NCR53c406a_queue /* queuecommand */, 1062 - .eh_abort_handler = NCR53c406a_abort /* abort */, 1063 - .eh_bus_reset_handler = NCR53c406a_bus_reset /* reset */, 1064 - .eh_device_reset_handler = NCR53c406a_device_reset /* reset */, 1065 1078 .eh_host_reset_handler = NCR53c406a_host_reset /* reset */, 1066 1079 .bios_param = NCR53c406a_biosparm /* biosparm */, 1067 1080 .can_queue = 1 /* can_queue */,
-9
drivers/scsi/aacraid/linit.c
··· 367 367 } 368 368 369 369 /* 370 - * XXX: does aac really need no error handling?? 371 - */ 372 - static int aac_eh_abort(struct scsi_cmnd *cmd) 373 - { 374 - return FAILED; 375 - } 376 - 377 - /* 378 370 * aac_eh_reset - Reset command handling 379 371 * @scsi_cmd: SCSI command block causing the reset 380 372 * ··· 675 683 .bios_param = aac_biosparm, 676 684 .shost_attrs = aac_attrs, 677 685 .slave_configure = aac_slave_configure, 678 - .eh_abort_handler = aac_eh_abort, 679 686 .eh_host_reset_handler = aac_eh_reset, 680 687 .can_queue = AAC_NUM_IO_FIB, 681 688 .this_id = 16,
-15
drivers/scsi/aha1542.c
··· 1348 1348 return 0; 1349 1349 } 1350 1350 1351 - static 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 1352 * This is a device reset. This is handled by sending a special command 1367 1353 * to the device. ··· 1803 1817 .detect = aha1542_detect, 1804 1818 .release = aha1542_release, 1805 1819 .queuecommand = aha1542_queuecommand, 1806 - .eh_abort_handler = aha1542_abort, 1807 1820 .eh_device_reset_handler= aha1542_dev_reset, 1808 1821 .eh_bus_reset_handler = aha1542_bus_reset, 1809 1822 .eh_host_reset_handler = aha1542_host_reset,
-1
drivers/scsi/aha1542.h
··· 133 133 134 134 static int aha1542_detect(Scsi_Host_Template *); 135 135 static int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 136 - static int aha1542_abort(Scsi_Cmnd * SCpnt); 137 136 static int aha1542_bus_reset(Scsi_Cmnd * SCpnt); 138 137 static int aha1542_dev_reset(Scsi_Cmnd * SCpnt); 139 138 static int aha1542_host_reset(Scsi_Cmnd * SCpnt);
-2
drivers/scsi/arm/cumana_1.c
··· 244 244 .info = cumanascsi_info, 245 245 .queuecommand = cumanascsi_queue_command, 246 246 .eh_abort_handler = NCR5380_abort, 247 - .eh_device_reset_handler= NCR5380_device_reset, 248 247 .eh_bus_reset_handler = NCR5380_bus_reset, 249 - .eh_host_reset_handler = NCR5380_host_reset, 250 248 .can_queue = 16, 251 249 .this_id = 7, 252 250 .sg_tablesize = SG_ALL,
-2
drivers/scsi/arm/ecoscsi.c
··· 162 162 .info = ecoscsi_info, 163 163 .queuecommand = ecoscsi_queue_command, 164 164 .eh_abort_handler = NCR5380_abort, 165 - .eh_device_reset_handler= NCR5380_device_reset, 166 165 .eh_bus_reset_handler = NCR5380_bus_reset, 167 - .eh_host_reset_handler = NCR5380_host_reset, 168 166 .can_queue = 16, 169 167 .this_id = 7, 170 168 .sg_tablesize = SG_ALL,
-2
drivers/scsi/arm/oak.c
··· 118 118 .info = oakscsi_info, 119 119 .queuecommand = oakscsi_queue_command, 120 120 .eh_abort_handler = NCR5380_abort, 121 - .eh_device_reset_handler= NCR5380_device_reset, 122 121 .eh_bus_reset_handler = NCR5380_bus_reset, 123 - .eh_host_reset_handler = NCR5380_host_reset, 124 122 .can_queue = 16, 125 123 .this_id = 7, 126 124 .sg_tablesize = SG_ALL,
-2
drivers/scsi/dmx3191d.c
··· 61 61 .queuecommand = NCR5380_queue_command, 62 62 .eh_abort_handler = NCR5380_abort, 63 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 64 .can_queue = 32, 67 65 .this_id = 7, 68 66 .sg_tablesize = SG_ALL,
-2
drivers/scsi/dtc.c
··· 482 482 .queuecommand = dtc_queue_command, 483 483 .eh_abort_handler = dtc_abort, 484 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 485 .bios_param = dtc_biosparam, 488 486 .can_queue = CAN_QUEUE, 489 487 .this_id = 7,
-4
drivers/scsi/dtc.h
··· 34 34 static int dtc_detect(Scsi_Host_Template *); 35 35 static int dtc_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 36 36 static int dtc_bus_reset(Scsi_Cmnd *); 37 - static int dtc_device_reset(Scsi_Cmnd *); 38 - static int dtc_host_reset(Scsi_Cmnd *); 39 37 40 38 #ifndef CMD_PER_LUN 41 39 #define CMD_PER_LUN 2 ··· 84 86 #define NCR5380_queue_command dtc_queue_command 85 87 #define NCR5380_abort dtc_abort 86 88 #define NCR5380_bus_reset dtc_bus_reset 87 - #define NCR5380_device_reset dtc_device_reset 88 - #define NCR5380_host_reset dtc_host_reset 89 89 #define NCR5380_proc_info dtc_proc_info 90 90 91 91 /* 15 12 11 10
-2
drivers/scsi/eata.c
··· 518 518 .release = eata2x_release, 519 519 .queuecommand = eata2x_queuecommand, 520 520 .eh_abort_handler = eata2x_eh_abort, 521 - .eh_device_reset_handler = NULL, 522 - .eh_bus_reset_handler = NULL, 523 521 .eh_host_reset_handler = eata2x_eh_host_reset, 524 522 .bios_param = eata2x_bios_param, 525 523 .slave_configure = eata2x_slave_configure,
-1
drivers/scsi/fcal.c
··· 311 311 .use_clustering = ENABLE_CLUSTERING, 312 312 .eh_abort_handler = fcp_scsi_abort, 313 313 .eh_device_reset_handler = fcp_scsi_dev_reset, 314 - .eh_bus_reset_handler = fcp_scsi_bus_reset, 315 314 .eh_host_reset_handler = fcp_scsi_host_reset, 316 315 }; 317 316 #include "scsi_module.c"
-12
drivers/scsi/fd_mcs.c
··· 1241 1241 return SUCCESS; 1242 1242 } 1243 1243 1244 - static int fd_mcs_host_reset(Scsi_Cmnd * SCpnt) 1245 - { 1246 - return FAILED; 1247 - } 1248 - 1249 - static int fd_mcs_device_reset(Scsi_Cmnd * SCpnt) 1250 - { 1251 - return FAILED; 1252 - } 1253 - 1254 1244 static int fd_mcs_bus_reset(Scsi_Cmnd * SCpnt) { 1255 1245 struct Scsi_Host *shpnt = SCpnt->device->host; 1256 1246 ··· 1347 1357 .queuecommand = fd_mcs_queue, 1348 1358 .eh_abort_handler = fd_mcs_abort, 1349 1359 .eh_bus_reset_handler = fd_mcs_bus_reset, 1350 - .eh_host_reset_handler = fd_mcs_host_reset, 1351 - .eh_device_reset_handler = fd_mcs_device_reset, 1352 1360 .bios_param = fd_mcs_biosparam, 1353 1361 .can_queue = 1, 1354 1362 .this_id = 7,
-2
drivers/scsi/g_NCR5380.c
··· 908 908 .queuecommand = generic_NCR5380_queue_command, 909 909 .eh_abort_handler = generic_NCR5380_abort, 910 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 911 .bios_param = NCR5380_BIOSPARAM, 914 912 .can_queue = CAN_QUEUE, 915 913 .this_id = 7,
-4
drivers/scsi/g_NCR5380.h
··· 49 49 static int generic_NCR5380_release_resources(struct Scsi_Host *); 50 50 static int generic_NCR5380_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 51 51 static int generic_NCR5380_bus_reset(Scsi_Cmnd *); 52 - static int generic_NCR5380_host_reset(Scsi_Cmnd *); 53 - static int generic_NCR5380_device_reset(Scsi_Cmnd *); 54 52 static const char* generic_NCR5380_info(struct Scsi_Host *); 55 53 56 54 #ifndef CMD_PER_LUN ··· 112 114 #define NCR5380_queue_command generic_NCR5380_queue_command 113 115 #define NCR5380_abort generic_NCR5380_abort 114 116 #define NCR5380_bus_reset generic_NCR5380_bus_reset 115 - #define NCR5380_device_reset generic_NCR5380_device_reset 116 - #define NCR5380_host_reset generic_NCR5380_host_reset 117 117 #define NCR5380_pread generic_NCR5380_pread 118 118 #define NCR5380_pwrite generic_NCR5380_pwrite 119 119 #define NCR5380_proc_info notyet_generic_proc_info
-23
drivers/scsi/gdth.c
··· 4703 4703 return ((const char *)ha->binfo.type_string); 4704 4704 } 4705 4705 4706 - /* new error handling */ 4707 - static int gdth_eh_abort(Scsi_Cmnd *scp) 4708 - { 4709 - TRACE2(("gdth_eh_abort()\n")); 4710 - return FAILED; 4711 - } 4712 - 4713 - static int gdth_eh_device_reset(Scsi_Cmnd *scp) 4714 - { 4715 - TRACE2(("gdth_eh_device_reset()\n")); 4716 - return FAILED; 4717 - } 4718 - 4719 4706 static int gdth_eh_bus_reset(Scsi_Cmnd *scp) 4720 4707 { 4721 4708 int i, hanum; ··· 4756 4769 } 4757 4770 return SUCCESS; 4758 4771 } 4759 - 4760 - static int gdth_eh_host_reset(Scsi_Cmnd *scp) 4761 - { 4762 - TRACE2(("gdth_eh_host_reset()\n")); 4763 - return FAILED; 4764 - } 4765 - 4766 4772 4767 4773 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) 4768 4774 static int gdth_bios_param(struct scsi_device *sdev,struct block_device *bdev,sector_t cap,int *ip) ··· 5693 5713 .release = gdth_release, 5694 5714 .info = gdth_info, 5695 5715 .queuecommand = gdth_queuecommand, 5696 - .eh_abort_handler = gdth_eh_abort, 5697 - .eh_device_reset_handler = gdth_eh_device_reset, 5698 5716 .eh_bus_reset_handler = gdth_eh_bus_reset, 5699 - .eh_host_reset_handler = gdth_eh_host_reset, 5700 5717 .bios_param = gdth_bios_param, 5701 5718 .can_queue = GDTH_MAXCMDS, 5702 5719 .this_id = -1,
-13
drivers/scsi/in2000.c
··· 1671 1671 return SUCCESS; 1672 1672 } 1673 1673 1674 - static int in2000_host_reset(Scsi_Cmnd * cmd) 1675 - { 1676 - return FAILED; 1677 - } 1678 - 1679 - static int in2000_device_reset(Scsi_Cmnd * cmd) 1680 - { 1681 - return FAILED; 1682 - } 1683 - 1684 - 1685 1674 static int in2000_abort(Scsi_Cmnd * cmd) 1686 1675 { 1687 1676 struct Scsi_Host *instance; ··· 2300 2311 .queuecommand = in2000_queuecommand, 2301 2312 .eh_abort_handler = in2000_abort, 2302 2313 .eh_bus_reset_handler = in2000_bus_reset, 2303 - .eh_device_reset_handler = in2000_device_reset, 2304 - .eh_host_reset_handler = in2000_host_reset, 2305 2314 .bios_param = in2000_biosparam, 2306 2315 .can_queue = IN2000_CAN_Q, 2307 2316 .this_id = IN2000_HOST_ID,
-2
drivers/scsi/in2000.h
··· 401 401 static void in2000_setup(char *, int *) in2000__INIT; 402 402 static int in2000_biosparam(struct scsi_device *, struct block_device *, 403 403 sector_t, int *); 404 - static int in2000_host_reset(Scsi_Cmnd *); 405 404 static int in2000_bus_reset(Scsi_Cmnd *); 406 - static int in2000_device_reset(Scsi_Cmnd *); 407 405 408 406 409 407 #define IN2000_CAN_Q 16
-6
drivers/scsi/mac53c94.c
··· 98 98 return 0; 99 99 } 100 100 101 - static int mac53c94_abort(struct scsi_cmnd *cmd) 102 - { 103 - return FAILED; 104 - } 105 - 106 101 static int mac53c94_host_reset(struct scsi_cmnd *cmd) 107 102 { 108 103 struct fsc_state *state = (struct fsc_state *) cmd->device->host->hostdata; ··· 411 416 .proc_name = "53c94", 412 417 .name = "53C94", 413 418 .queuecommand = mac53c94_queue, 414 - .eh_abort_handler = mac53c94_abort, 415 419 .eh_host_reset_handler = mac53c94_host_reset, 416 420 .can_queue = 1, 417 421 .this_id = 7,
-2
drivers/scsi/mac_scsi.c
··· 591 591 .queuecommand = macscsi_queue_command, 592 592 .eh_abort_handler = macscsi_abort, 593 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 594 .can_queue = CAN_QUEUE, 597 595 .this_id = 7, 598 596 .sg_tablesize = SG_ALL,
-2
drivers/scsi/mac_scsi.h
··· 72 72 #define NCR5380_queue_command macscsi_queue_command 73 73 #define NCR5380_abort macscsi_abort 74 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 75 #define NCR5380_proc_info macscsi_proc_info 78 76 79 77 #define BOARD_NORMAL 0
-1
drivers/scsi/nsp32.c
··· 294 294 .this_id = NSP32_HOST_SCSIID, 295 295 .use_clustering = DISABLE_CLUSTERING, 296 296 .eh_abort_handler = nsp32_eh_abort, 297 - /* .eh_device_reset_handler = NULL, */ 298 297 .eh_bus_reset_handler = nsp32_eh_bus_reset, 299 298 .eh_host_reset_handler = nsp32_eh_host_reset, 300 299 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,74))
-2
drivers/scsi/pas16.c
··· 621 621 .queuecommand = pas16_queue_command, 622 622 .eh_abort_handler = pas16_abort, 623 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 624 .bios_param = pas16_biosparam, 627 625 .can_queue = CAN_QUEUE, 628 626 .this_id = 7,
-4
drivers/scsi/pas16.h
··· 120 120 static int pas16_detect(Scsi_Host_Template *); 121 121 static int pas16_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 122 122 static int pas16_bus_reset(Scsi_Cmnd *); 123 - static int pas16_host_reset(Scsi_Cmnd *); 124 - static int pas16_device_reset(Scsi_Cmnd *); 125 123 126 124 #ifndef CMD_PER_LUN 127 125 #define CMD_PER_LUN 2 ··· 162 164 #define do_NCR5380_intr do_pas16_intr 163 165 #define NCR5380_queue_command pas16_queue_command 164 166 #define NCR5380_abort pas16_abort 165 - #define NCR5380_device_reset pas16_device_reset 166 167 #define NCR5380_bus_reset pas16_bus_reset 167 - #define NCR5380_host_reset pas16_host_reset 168 168 #define NCR5380_proc_info pas16_proc_info 169 169 170 170 /* 15 14 12 10 7 5 3
-15
drivers/scsi/pcmcia/nsp_cs.c
··· 92 92 #endif 93 93 .info = nsp_info, 94 94 .queuecommand = nsp_queuecommand, 95 - /* .eh_strategy_handler = nsp_eh_strategy,*/ 96 95 /* .eh_abort_handler = nsp_eh_abort,*/ 97 - /* .eh_device_reset_handler = nsp_eh_device_reset,*/ 98 96 .eh_bus_reset_handler = nsp_eh_bus_reset, 99 97 .eh_host_reset_handler = nsp_eh_host_reset, 100 98 .can_queue = 1, ··· 1534 1536 /* error handler */ 1535 1537 /*---------------------------------------------------------------*/ 1536 1538 1537 - /*static int nsp_eh_strategy(struct Scsi_Host *Shost) 1538 - { 1539 - return FAILED; 1540 - }*/ 1541 - 1542 1539 /* 1543 1540 static int nsp_eh_abort(Scsi_Cmnd *SCpnt) 1544 1541 { 1545 1542 nsp_dbg(NSP_DEBUG_BUSRESET, "SCpnt=0x%p", SCpnt); 1546 1543 1547 1544 return nsp_eh_bus_reset(SCpnt); 1548 - }*/ 1549 - 1550 - /* 1551 - static int nsp_eh_device_reset(Scsi_Cmnd *SCpnt) 1552 - { 1553 - nsp_dbg(NSP_DEBUG_BUSRESET, "%s: SCpnt=0x%p", SCpnt); 1554 - 1555 - return FAILED; 1556 1545 }*/ 1557 1546 1558 1547 static int nsp_bus_reset(nsp_hw_data *data)
-2
drivers/scsi/pcmcia/qlogic_stub.c
··· 81 81 .queuecommand = qlogicfas408_queuecommand, 82 82 .eh_abort_handler = qlogicfas408_abort, 83 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 84 .bios_param = qlogicfas408_biosparam, 87 85 .can_queue = 1, 88 86 .this_id = -1,
-1
drivers/scsi/pluto.c
··· 354 354 .use_clustering = ENABLE_CLUSTERING, 355 355 .eh_abort_handler = fcp_scsi_abort, 356 356 .eh_device_reset_handler = fcp_scsi_dev_reset, 357 - .eh_bus_reset_handler = fcp_scsi_bus_reset, 358 357 .eh_host_reset_handler = fcp_scsi_host_reset, 359 358 }; 360 359
-2
drivers/scsi/qlogicfas.c
··· 191 191 .queuecommand = qlogicfas408_queuecommand, 192 192 .eh_abort_handler = qlogicfas408_abort, 193 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 194 .bios_param = qlogicfas408_biosparam, 197 195 .can_queue = 1, 198 196 .this_id = -1,
-20
drivers/scsi/qlogicfas408.c
··· 516 516 return SUCCESS; 517 517 } 518 518 519 - /* 520 - * Reset SCSI host controller 521 - */ 522 - 523 - int qlogicfas408_host_reset(Scsi_Cmnd * cmd) 524 - { 525 - return FAILED; 526 - } 527 - 528 - /* 529 - * Reset SCSI device 530 - */ 531 - 532 - int qlogicfas408_device_reset(Scsi_Cmnd * cmd) 533 - { 534 - return FAILED; 535 - } 536 - 537 519 /* 538 520 * Return info string 539 521 */ ··· 608 626 EXPORT_SYMBOL(qlogicfas408_queuecommand); 609 627 EXPORT_SYMBOL(qlogicfas408_abort); 610 628 EXPORT_SYMBOL(qlogicfas408_bus_reset); 611 - EXPORT_SYMBOL(qlogicfas408_device_reset); 612 - EXPORT_SYMBOL(qlogicfas408_host_reset); 613 629 EXPORT_SYMBOL(qlogicfas408_biosparam); 614 630 EXPORT_SYMBOL(qlogicfas408_ihandl); 615 631 EXPORT_SYMBOL(qlogicfas408_get_chip_type);
-2
drivers/scsi/qlogicfas408.h
··· 109 109 sector_t capacity, int ip[]); 110 110 int qlogicfas408_abort(Scsi_Cmnd * cmd); 111 111 int qlogicfas408_bus_reset(Scsi_Cmnd * cmd); 112 - int qlogicfas408_host_reset(Scsi_Cmnd * cmd); 113 - int qlogicfas408_device_reset(Scsi_Cmnd * cmd); 114 112 const char *qlogicfas408_info(struct Scsi_Host *host); 115 113 int qlogicfas408_get_chip_type(int qbase, int int_type); 116 114 void qlogicfas408_setup(int qbase, int id, int int_type);
-12
drivers/scsi/seagate.c
··· 1640 1640 return SUCCESS; 1641 1641 } 1642 1642 1643 - static int seagate_st0x_host_reset(Scsi_Cmnd *SCpnt) 1644 - { 1645 - return FAILED; 1646 - } 1647 - 1648 - static int seagate_st0x_device_reset(Scsi_Cmnd *SCpnt) 1649 - { 1650 - return FAILED; 1651 - } 1652 - 1653 1643 static int seagate_st0x_release(struct Scsi_Host *shost) 1654 1644 { 1655 1645 if (shost->irq) ··· 1655 1665 .queuecommand = seagate_st0x_queue_command, 1656 1666 .eh_abort_handler = seagate_st0x_abort, 1657 1667 .eh_bus_reset_handler = seagate_st0x_bus_reset, 1658 - .eh_host_reset_handler = seagate_st0x_host_reset, 1659 - .eh_device_reset_handler = seagate_st0x_device_reset, 1660 1668 .can_queue = 1, 1661 1669 .this_id = 7, 1662 1670 .sg_tablesize = SG_ALL,
-2
drivers/scsi/seagate.h
··· 15 15 static int seagate_st0x_abort(Scsi_Cmnd *); 16 16 static const char *seagate_st0x_info(struct Scsi_Host *); 17 17 static int seagate_st0x_bus_reset(Scsi_Cmnd *); 18 - static int seagate_st0x_device_reset(Scsi_Cmnd *); 19 - static int seagate_st0x_host_reset(Scsi_Cmnd *); 20 18 21 19 #endif /* _SEAGATE_H */
-18
drivers/scsi/sym53c416.c
··· 785 785 return 0; 786 786 } 787 787 788 - static int sym53c416_abort(Scsi_Cmnd *SCpnt) 789 - { 790 - return FAILED; 791 - } 792 - 793 - static int sym53c416_bus_reset(Scsi_Cmnd *SCpnt) 794 - { 795 - return FAILED; 796 - } 797 - 798 - static int sym53c416_device_reset(Scsi_Cmnd *SCpnt) 799 - { 800 - return FAILED; 801 - } 802 - 803 788 static int sym53c416_host_reset(Scsi_Cmnd *SCpnt) 804 789 { 805 790 int base; ··· 850 865 .detect = sym53c416_detect, 851 866 .info = sym53c416_info, 852 867 .queuecommand = sym53c416_queuecommand, 853 - .eh_abort_handler = sym53c416_abort, 854 868 .eh_host_reset_handler =sym53c416_host_reset, 855 - .eh_bus_reset_handler = sym53c416_bus_reset, 856 - .eh_device_reset_handler =sym53c416_device_reset, 857 869 .release = sym53c416_release, 858 870 .bios_param = sym53c416_bios_param, 859 871 .can_queue = 1,
-3
drivers/scsi/sym53c416.h
··· 26 26 static const char *sym53c416_info(struct Scsi_Host *); 27 27 static int sym53c416_release(struct Scsi_Host *); 28 28 static int sym53c416_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 29 - static int sym53c416_abort(Scsi_Cmnd *); 30 29 static int sym53c416_host_reset(Scsi_Cmnd *); 31 - static int sym53c416_bus_reset(Scsi_Cmnd *); 32 - static int sym53c416_device_reset(Scsi_Cmnd *); 33 30 static int sym53c416_bios_param(struct scsi_device *, struct block_device *, 34 31 sector_t, int *); 35 32 static void sym53c416_setup(char *str, int *ints);
-2
drivers/scsi/t128.c
··· 437 437 .queuecommand = t128_queue_command, 438 438 .eh_abort_handler = t128_abort, 439 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 440 .bios_param = t128_biosparam, 443 441 .can_queue = CAN_QUEUE, 444 442 .this_id = 7,
-4
drivers/scsi/t128.h
··· 96 96 sector_t, int*); 97 97 static int t128_detect(Scsi_Host_Template *); 98 98 static int t128_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); 99 - static int t128_host_reset(Scsi_Cmnd *); 100 99 static int t128_bus_reset(Scsi_Cmnd *); 101 - static int t128_device_reset(Scsi_Cmnd *); 102 100 103 101 #ifndef CMD_PER_LUN 104 102 #define CMD_PER_LUN 2 ··· 138 140 #define do_NCR5380_intr do_t128_intr 139 141 #define NCR5380_queue_command t128_queue_command 140 142 #define NCR5380_abort t128_abort 141 - #define NCR5380_host_reset t128_host_reset 142 - #define NCR5380_device_reset t128_device_reset 143 143 #define NCR5380_bus_reset t128_bus_reset 144 144 #define NCR5380_proc_info t128_proc_info 145 145
-2
drivers/scsi/u14-34f.c
··· 446 446 .release = u14_34f_release, 447 447 .queuecommand = u14_34f_queuecommand, 448 448 .eh_abort_handler = u14_34f_eh_abort, 449 - .eh_device_reset_handler = NULL, 450 - .eh_bus_reset_handler = NULL, 451 449 .eh_host_reset_handler = u14_34f_eh_host_reset, 452 450 .bios_param = u14_34f_bios_param, 453 451 .slave_configure = u14_34f_slave_configure,