Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b68d341 authored by Finn Thain's avatar Finn Thain Committed by Martin K. Petersen
Browse files

ncr5380: Remove unused hostdata->aborted flag 



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

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Tested-by: default avatarOndrej Zary <linux@rainbow-software.org>
Tested-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3be1b3ea

drivers/scsi/NCR5380.c

+0 −2
Original line number Diff line number Diff line
@@ -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.

drivers/scsi/NCR5380.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/scsi/atari_NCR5380.c

+0 −2
Original line number Diff line number Diff line
@@ -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