diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-05-28 07:52:51 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-17 13:04:45 -0400 |
commit | 3471c288036bf0835a82d0b1bbce2002f6e68390 (patch) | |
tree | 9a646a16877b7c600c583a32f703dd02a621c603 /drivers/scsi/gdth.c | |
parent | e3df715501be3329986e5d9dfa9a477f49e7996b (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/scsi/gdth.c')
-rw-r--r-- | drivers/scsi/gdth.c | 23 |
1 files changed, 0 insertions, 23 deletions
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 */ | ||
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 | static int gdth_eh_bus_reset(Scsi_Cmnd *scp) | 4706 | static 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 | ||
4773 | static 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) |
4781 | static int gdth_bios_param(struct scsi_device *sdev,struct block_device *bdev,sector_t cap,int *ip) | 4761 | static 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, |