提交 9b68d341 编写于 作者: F Finn Thain 提交者: Martin K. Petersen

ncr5380: Remove unused hostdata->aborted flag

The aborted flag was introduced in v1.1.38 but never used. Remove it.
Signed-off-by: NFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: NHannes Reinecke <hare@suse.com>
Tested-by: NOndrej Zary <linux@rainbow-software.org>
Tested-by: NMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
上级 3be1b3ea
...@@ -781,7 +781,6 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags) ...@@ -781,7 +781,6 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags)
if(in_interrupt()) if(in_interrupt())
printk(KERN_ERR "NCR5380_init called with interrupts off!\n"); printk(KERN_ERR "NCR5380_init called with interrupts off!\n");
hostdata->aborted = 0;
hostdata->id_mask = 1 << instance->this_id; hostdata->id_mask = 1 << instance->this_id;
for (i = hostdata->id_mask; i <= 0x80; i <<= 1) for (i = hostdata->id_mask; i <= 0x80; i <<= 1)
if (i > hostdata->id_mask) if (i > hostdata->id_mask)
...@@ -2574,7 +2573,6 @@ static int NCR5380_abort(struct scsi_cmnd *cmd) ...@@ -2574,7 +2573,6 @@ static int NCR5380_abort(struct scsi_cmnd *cmd)
if (hostdata->connected == cmd) { if (hostdata->connected == cmd) {
dprintk(NDEBUG_ABORT, "scsi%d : aborting connected command\n", instance->host_no); dprintk(NDEBUG_ABORT, "scsi%d : aborting connected command\n", instance->host_no);
hostdata->aborted = 1;
/* /*
* We should perform BSY checking, and make sure we haven't slipped * We should perform BSY checking, and make sure we haven't slipped
* into BUS FREE. * into BUS FREE.
......
...@@ -271,7 +271,6 @@ struct NCR5380_hostdata { ...@@ -271,7 +271,6 @@ struct NCR5380_hostdata {
volatile int restart_select; /* we have disconnected, volatile int restart_select; /* we have disconnected,
used to restart used to restart
NCR5380_select() */ NCR5380_select() */
volatile unsigned aborted:1; /* flag, says aborted */
int flags; int flags;
unsigned long time_expires; /* in jiffies, set prior to sleeping */ unsigned long time_expires; /* in jiffies, set prior to sleeping */
int select_time; /* timer in select for target response */ int select_time; /* timer in select for target response */
......
...@@ -813,7 +813,6 @@ static int __init NCR5380_init(struct Scsi_Host *instance, int flags) ...@@ -813,7 +813,6 @@ static int __init NCR5380_init(struct Scsi_Host *instance, int flags)
SETUP_HOSTDATA(instance); SETUP_HOSTDATA(instance);
hostdata->host = instance; hostdata->host = instance;
hostdata->aborted = 0;
hostdata->id_mask = 1 << instance->this_id; hostdata->id_mask = 1 << instance->this_id;
hostdata->id_higher_mask = 0; hostdata->id_higher_mask = 0;
for (i = hostdata->id_mask; i <= 0x80; i <<= 1) for (i = hostdata->id_mask; i <= 0x80; i <<= 1)
...@@ -2834,7 +2833,6 @@ int NCR5380_abort(struct scsi_cmnd *cmd) ...@@ -2834,7 +2833,6 @@ int NCR5380_abort(struct scsi_cmnd *cmd)
*/ */
if (do_abort(instance) == 0) { if (do_abort(instance) == 0) {
hostdata->aborted = 1;
hostdata->connected = NULL; hostdata->connected = NULL;
cmd->result = DID_ABORT << 16; cmd->result = DID_ABORT << 16;
#ifdef SUPPORT_TAGS #ifdef SUPPORT_TAGS
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册