diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2014-11-12 16:11:54 +1100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-11-20 09:11:06 +0100 |
| commit | 997acab7d593913eaa0606ff257079efcfcb146d (patch) | |
| tree | 239997e829da105725a82d12d981c2ae9b6d4189 /drivers/scsi/NCR5380.c | |
| parent | 76f13b9321ec8f9550cd1557ed28ac6ae91e612c (diff) | |
ncr5380: Remove redundant AUTOSENSE macro
Every NCR5380 driver sets AUTOSENSE so it need not be optional (and the
mid-layer expects it). Remove this redundant macro to improve readability.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/NCR5380.c')
| -rw-r--r-- | drivers/scsi/NCR5380.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 0a8786acddc3..e17e64e3e0d9 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -627,9 +627,6 @@ NCR5380_print_options(struct Scsi_Host *instance) #ifdef AUTOPROBE_IRQ " AUTOPROBE_IRQ" #endif -#ifdef AUTOSENSE - " AUTOSENSE" -#endif #ifdef DIFFERENTIAL " DIFFERENTIAL" #endif @@ -857,12 +854,6 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags) hostdata->host = instance; hostdata->time_expires = 0; -#ifndef AUTOSENSE - if ((instance->cmd_per_lun > 1) || instance->can_queue > 1) - printk(KERN_WARNING "scsi%d : WARNING : support for multiple outstanding commands enabled\n" " without AUTOSENSE option, contingent allegiance conditions may\n" - " be incorrectly cleared.\n", instance->host_no); -#endif /* def AUTOSENSE */ - NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); NCR5380_write(MODE_REG, MR_BASE); NCR5380_write(TARGET_COMMAND_REG, 0); @@ -2260,7 +2251,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { else if (status_byte(cmd->SCp.Status) != GOOD) cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16); -#ifdef AUTOSENSE if ((cmd->cmnd[0] == REQUEST_SENSE) && hostdata->ses.cmd_len) { scsi_eh_restore_cmnd(cmd, &hostdata->ses); @@ -2277,9 +2267,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { hostdata->issue_queue; hostdata->issue_queue = (Scsi_Cmnd *) cmd; dprintk(NDEBUG_QUEUES, "scsi%d : REQUEST SENSE added to head of issue queue\n", instance->host_no); - } else -#endif /* def AUTOSENSE */ - { + } else { collect_stats(hostdata, cmd); cmd->scsi_done(cmd); } |