ncr5380: Remove unused hostdata->aborted flag

The aborted flag was introduced in v1.1.38 but never used. Remove it.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index b9755000b48f5d83ec19cfa6216499574d1b0fed..663773e6687270b5351481b30dd6fc126fee566e 100644 (file)
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -781,7 +781,6 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags)
        if(in_interrupt())
                printk(KERN_ERR "NCR5380_init called with interrupts off!\n");
 
-       hostdata->aborted = 0;
        hostdata->id_mask = 1 << instance->this_id;
        for (i = hostdata->id_mask; i <= 0x80; i <<= 1)
                if (i > hostdata->id_mask)
@@ -2574,7 +2573,6 @@ static int NCR5380_abort(struct scsi_cmnd *cmd)
 
        if (hostdata->connected == cmd) {
                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
  * into BUS FREE.

diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h
index f2f737a5f75a165976f43be629c3460dee761f89..4a31f41b6027789650a8b839c55f66f840abfef3 100644 (file)
--- a/drivers/scsi/NCR5380.h
+++ b/drivers/scsi/NCR5380.h
@@ -271,7 +271,6 @@ struct NCR5380_hostdata {
        volatile int restart_select;            /* we have disconnected,
                                                   used to restart 
                                                   NCR5380_select() */
-       volatile unsigned aborted:1;            /* flag, says aborted */
        int flags;
        unsigned long time_expires;             /* in jiffies, set prior to sleeping */
        int select_time;                        /* timer in select for target response */

diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 5a9974e1943ce74924c3b6acc2291e3803e145ec..463d2d47661a9f0e320d7ce28054bdd88a81ff3a 100644 (file)
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -813,7 +813,6 @@ static int __init NCR5380_init(struct Scsi_Host *instance, int flags)
        SETUP_HOSTDATA(instance);
 
        hostdata->host = instance;
-       hostdata->aborted = 0;
        hostdata->id_mask = 1 << instance->this_id;
        hostdata->id_higher_mask = 0;
        for (i = hostdata->id_mask; i <= 0x80; i <<= 1)
@@ -2834,7 +2833,6 @@ int NCR5380_abort(struct scsi_cmnd *cmd)
                 */
 
                if (do_abort(instance) == 0) {
-                       hostdata->aborted = 1;
                        hostdata->connected = NULL;
                        cmd->result = DID_ABORT << 16;
 #ifdef SUPPORT_TAGS