summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_error.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2005-05-13 17:46:18 +0200
committerJames Bottomley <jejb@mulgrave.(none)>2005-05-20 19:53:53 +0200
commit5b8ef8425898e957243053c26ac2b68bd4bc42ec (patch)
tree258db4841aca495cf8c3f0384d8db0e20c235721 /drivers/scsi/scsi_error.c
parent[SCSI] remove unnecessary scsi_delete_timer() call in scsi_reset_provider() (diff)
downloadlinux-5b8ef8425898e957243053c26ac2b68bd4bc42ec.tar.xz
linux-5b8ef8425898e957243053c26ac2b68bd4bc42ec.zip
[SCSI] remove spurious if tests from scsi_eh_{times_out|done}
'if' tests which check if eh_action isn't NULL in both functions are always true. Remove the redundant if's as it can give wrong impressions. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/scsi_error.c')
-rw-r--r--drivers/scsi/scsi_error.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index f5195cda5ef1..103558574662 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -434,8 +434,7 @@ static void scsi_eh_times_out(struct scsi_cmnd *scmd)
SCSI_LOG_ERROR_RECOVERY(3, printk("%s: scmd:%p\n", __FUNCTION__,
scmd));
- if (scmd->device->host->eh_action)
- up(scmd->device->host->eh_action);
+ up(scmd->device->host->eh_action);
}
/**
@@ -457,8 +456,7 @@ static void scsi_eh_done(struct scsi_cmnd *scmd)
SCSI_LOG_ERROR_RECOVERY(3, printk("%s scmd: %p result: %x\n",
__FUNCTION__, scmd, scmd->result));
- if (scmd->device->host->eh_action)
- up(scmd->device->host->eh_action);
+ up(scmd->device->host->eh_action);
}
}