diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-05-28 07:52:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-17 12:04:45 -0500 |
| commit | 3471c288036bf0835a82d0b1bbce2002f6e68390 (patch) | |
| tree | 9a646a16877b7c600c583a32f703dd02a621c603 /drivers/scsi/pcmcia | |
| parent | e3df715501be3329986e5d9dfa9a477f49e7996b (diff) | |
| download | linux-3471c288036bf0835a82d0b1bbce2002f6e68390.tar.gz | |
[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/scsi/pcmcia')
| -rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 15 | ||||
| -rw-r--r-- | drivers/scsi/pcmcia/qlogic_stub.c | 2 |
2 files changed, 0 insertions, 17 deletions
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 = { #endif .info = nsp_info, .queuecommand = nsp_queuecommand, -/* .eh_strategy_handler = nsp_eh_strategy,*/ /* .eh_abort_handler = nsp_eh_abort,*/ -/* .eh_device_reset_handler = nsp_eh_device_reset,*/ .eh_bus_reset_handler = nsp_eh_bus_reset, .eh_host_reset_handler = nsp_eh_host_reset, .can_queue = 1, @@ -1536,11 +1534,6 @@ nsp_proc_info( /* error handler */ /*---------------------------------------------------------------*/ -/*static int nsp_eh_strategy(struct Scsi_Host *Shost) -{ - return FAILED; -}*/ - /* static int nsp_eh_abort(Scsi_Cmnd *SCpnt) { @@ -1549,14 +1542,6 @@ static int nsp_eh_abort(Scsi_Cmnd *SCpnt) return nsp_eh_bus_reset(SCpnt); }*/ -/* -static int nsp_eh_device_reset(Scsi_Cmnd *SCpnt) -{ - nsp_dbg(NSP_DEBUG_BUSRESET, "%s: SCpnt=0x%p", SCpnt); - - return FAILED; -}*/ - static int nsp_bus_reset(nsp_hw_data *data) { 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 = { .queuecommand = qlogicfas408_queuecommand, .eh_abort_handler = qlogicfas408_abort, .eh_bus_reset_handler = qlogicfas408_bus_reset, - .eh_device_reset_handler= qlogicfas408_device_reset, - .eh_host_reset_handler = qlogicfas408_host_reset, .bios_param = qlogicfas408_biosparam, .can_queue = 1, .this_id = -1, |