UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Finn Thain 2016-01-03 16:05:13 +11:00 committed by Martin K. Petersen
parent 3be1b3ea6d
commit 9b68d3415b
3 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/NCR5380.c
View File

@ -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)
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.

1
drivers/scsi/NCR5380.h
View File

@ -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 */

2
drivers/scsi/atari_NCR5380.c
View File

@ -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)
*/ */
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