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

Commit 206cc031 authored by Finn Thain's avatar Finn Thain Committed by Martin K. Petersen
Browse files

ncr5380: Remove redundant register writes 



Remove the duplicate write to the Select Enable Register that appeared
in v1.1.38.

Also remove the redundant write to Initiator Command Register prior to
calling do_abort().

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 9b68d341

drivers/scsi/NCR5380.c

+0 −2
Original line number Diff line number Diff line
@@ -1384,7 +1384,6 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd) 
		cmd->scsi_done(cmd);

		NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);

		dprintk(NDEBUG_SELECTION, "scsi%d : target did not respond within 250ms\n", instance->host_no);

		NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);

		return 0;

	}

	hostdata->targets_present |= (1 << scmd_id(cmd));
@@ -2076,7 +2075,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { 
						scmd_printk(KERN_INFO, cmd,

							    "switching to slow handshake\n");

						cmd->device->borken = 1;

						NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN);

						sink = 1;

						do_abort(instance);

						cmd->result = DID_ERROR << 16;

drivers/scsi/atari_NCR5380.c

+0 −3
Original line number Diff line number Diff line
@@ -1640,7 +1640,6 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd) 
		cmd->scsi_done(cmd);

		NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);

		dprintk(NDEBUG_SELECTION, "scsi%d: target did not respond within 250ms\n", HOSTNO);

		NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);

		return 0;

	}
@@ -2192,8 +2191,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) 
						scmd_printk(KERN_INFO, cmd,

							"switching to slow handshake\n");

						cmd->device->borken = 1;

						NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |

							ICR_ASSERT_ATN);

						sink = 1;

						do_abort(instance);

						cmd->result = DID_ERROR << 16;