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

Commit 12e5fc66 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: NCR5380: Move bus reset to host reset 



The bus reset handler really is a host reset, so move it to
eh_bus_reset_handler.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Acked-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 74fa80ee

drivers/scsi/NCR5380.c

+2 −2
Original line number Diff line number Diff line
@@ -2296,13 +2296,13 @@ static int NCR5380_abort(struct scsi_cmnd *cmd) 




/**

 * NCR5380_bus_reset - reset the SCSI bus

 * NCR5380_host_reset - reset the SCSI host

 * @cmd: SCSI command undergoing EH

 *

 * Returns SUCCESS

 */



static int NCR5380_bus_reset(struct scsi_cmnd *cmd)

static int NCR5380_host_reset(struct scsi_cmnd *cmd)

{

	struct Scsi_Host *instance = cmd->device->host;

	struct NCR5380_hostdata *hostdata = shost_priv(instance);

drivers/scsi/arm/cumana_1.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static struct scsi_host_template cumanascsi_template = { 
	.info			= cumanascsi_info,

	.queuecommand		= cumanascsi_queue_command,

	.eh_abort_handler	= NCR5380_abort,

	.eh_bus_reset_handler	= NCR5380_bus_reset,

	.eh_host_reset_handler	= NCR5380_host_reset,

	.can_queue		= 16,

	.this_id		= 7,

	.sg_tablesize		= SG_ALL,

drivers/scsi/arm/oak.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static struct scsi_host_template oakscsi_template = { 
	.info			= oakscsi_info,

	.queuecommand		= oakscsi_queue_command,

	.eh_abort_handler	= NCR5380_abort,

	.eh_bus_reset_handler	= NCR5380_bus_reset,

	.eh_host_reset_handler	= NCR5380_host_reset,

	.can_queue		= 16,

	.this_id		= 7,

	.sg_tablesize		= SG_ALL,

drivers/scsi/atari_scsi.c

+3 −3
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static void atari_scsi_falcon_reg_write(unsigned int reg, u8 value) 


#include "NCR5380.c"



static int atari_scsi_bus_reset(struct scsi_cmnd *cmd)

static int atari_scsi_host_reset(struct scsi_cmnd *cmd)

{

	int rv;

	unsigned long flags;
@@ -688,7 +688,7 @@ static int atari_scsi_bus_reset(struct scsi_cmnd *cmd) 
		atari_dma_orig_addr = NULL;

	}



	rv = NCR5380_bus_reset(cmd);

	rv = NCR5380_host_reset(cmd);



	/* The 5380 raises its IRQ line while _RST is active but the ST DMA

	 * "lock" has been released so this interrupt may end up handled by
@@ -711,7 +711,7 @@ static struct scsi_host_template atari_scsi_template = { 
	.info			= atari_scsi_info,

	.queuecommand		= atari_scsi_queue_command,

	.eh_abort_handler	= atari_scsi_abort,

	.eh_bus_reset_handler	= atari_scsi_bus_reset,

	.eh_host_reset_handler	= atari_scsi_host_reset,

	.this_id		= 7,

	.cmd_per_lun		= 2,

	.use_clustering		= DISABLE_CLUSTERING,

drivers/scsi/dmx3191d.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static struct scsi_host_template dmx3191d_driver_template = { 
	.info			= NCR5380_info,

	.queuecommand		= NCR5380_queue_command,

	.eh_abort_handler	= NCR5380_abort,

	.eh_bus_reset_handler	= NCR5380_bus_reset,

	.eh_host_reset_handler	= NCR5380_host_reset,

	.can_queue		= 32,

	.this_id		= 7,

	.sg_tablesize		= SG_ALL,