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>
This commit is contained in:

committed by
Christoph Hellwig

orang tua
76f13b9321
melakukan
997acab7d5
@@ -683,9 +683,6 @@ static inline void NCR5380_all_init(void)
|
||||
static void __init NCR5380_print_options(struct Scsi_Host *instance)
|
||||
{
|
||||
printk(" generic options"
|
||||
#ifdef AUTOSENSE
|
||||
" AUTOSENSE"
|
||||
#endif
|
||||
#ifdef REAL_DMA
|
||||
" REAL DMA"
|
||||
#endif
|
||||
@@ -842,13 +839,6 @@ static int __init NCR5380_init(struct Scsi_Host *instance, int flags)
|
||||
first_instance = instance;
|
||||
}
|
||||
|
||||
#ifndef AUTOSENSE
|
||||
if ((instance->cmd_per_lun > 1) || (instance->can_queue > 1))
|
||||
printk("scsi%d: WARNING : support for multiple outstanding commands enabled\n"
|
||||
" without AUTOSENSE option, contingent allegiance conditions may\n"
|
||||
" be incorrectly cleared.\n", HOSTNO);
|
||||
#endif /* def AUTOSENSE */
|
||||
|
||||
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
|
||||
NCR5380_write(MODE_REG, MR_BASE);
|
||||
NCR5380_write(TARGET_COMMAND_REG, 0);
|
||||
@@ -2199,7 +2189,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);
|
||||
@@ -2219,9 +2208,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
|
||||
local_irq_restore(flags);
|
||||
dprintk(NDEBUG_QUEUES, "scsi%d: REQUEST SENSE added to head of "
|
||||
"issue queue\n", H_NO(cmd));
|
||||
} else
|
||||
#endif /* def AUTOSENSE */
|
||||
{
|
||||
} else {
|
||||
#ifdef NCR5380_STATS
|
||||
collect_stats(hostdata, cmd);
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user