openharmony/kernel_linux
1
0
Fork 0
mirror of https://gitee.com/openharmony/kernel_linux synced 2025-04-14 05:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scsi: NCR5380: Move bus reset to host reset

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

Signed-off-by: Hannes Reinecke <hare@suse.com>
Acked-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Hannes Reinecke 2017-08-25 13:57:10 +02:00 committed by Martin K. Petersen
parent 74fa80ee3f
commit 12e5fc665a
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/NCR5380.c
View File

@ -2296,13 +2296,13 @@ out:
/** /**
* NCR5380_bus_reset - reset the SCSI bus * NCR5380_host_reset - reset the SCSI host
* @cmd: SCSI command undergoing EH * @cmd: SCSI command undergoing EH
* *
* Returns SUCCESS * 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 Scsi_Host *instance = cmd->device->host;
struct NCR5380_hostdata *hostdata = shost_priv(instance); struct NCR5380_hostdata *hostdata = shost_priv(instance);

2
drivers/scsi/arm/cumana_1.c
View File

@ -216,7 +216,7 @@ static struct scsi_host_template cumanascsi_template = {
.info = cumanascsi_info, .info = cumanascsi_info,
.queuecommand = cumanascsi_queue_command, .queuecommand = cumanascsi_queue_command,
.eh_abort_handler = NCR5380_abort, .eh_abort_handler = NCR5380_abort,
.eh_bus_reset_handler = NCR5380_bus_reset, .eh_host_reset_handler = NCR5380_host_reset,
.can_queue = 16, .can_queue = 16,
.this_id = 7, .this_id = 7,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,

2
drivers/scsi/arm/oak.c
View File

@ -105,7 +105,7 @@ static struct scsi_host_template oakscsi_template = {
.info = oakscsi_info, .info = oakscsi_info,
.queuecommand = oakscsi_queue_command, .queuecommand = oakscsi_queue_command,
.eh_abort_handler = NCR5380_abort, .eh_abort_handler = NCR5380_abort,
.eh_bus_reset_handler = NCR5380_bus_reset, .eh_host_reset_handler = NCR5380_host_reset,
.can_queue = 16, .can_queue = 16,
.this_id = 7, .this_id = 7,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,

6
drivers/scsi/atari_scsi.c
View File

@ -671,7 +671,7 @@ static void atari_scsi_falcon_reg_write(unsigned int reg, u8 value)
#include "NCR5380.c" #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; int rv;
unsigned long flags; unsigned long flags;
@ -688,7 +688,7 @@ static int atari_scsi_bus_reset(struct scsi_cmnd *cmd)
atari_dma_orig_addr = NULL; 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 /* 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 * "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, .info = atari_scsi_info,
.queuecommand = atari_scsi_queue_command, .queuecommand = atari_scsi_queue_command,
.eh_abort_handler = atari_scsi_abort, .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, .this_id = 7,
.cmd_per_lun = 2, .cmd_per_lun = 2,
.use_clustering = DISABLE_CLUSTERING, .use_clustering = DISABLE_CLUSTERING,

2
drivers/scsi/dmx3191d.c
View File

@ -58,7 +58,7 @@ static struct scsi_host_template dmx3191d_driver_template = {
.info = NCR5380_info, .info = NCR5380_info,
.queuecommand = NCR5380_queue_command, .queuecommand = NCR5380_queue_command,
.eh_abort_handler = NCR5380_abort, .eh_abort_handler = NCR5380_abort,
.eh_bus_reset_handler = NCR5380_bus_reset, .eh_host_reset_handler = NCR5380_host_reset,
.can_queue = 32, .can_queue = 32,
.this_id = 7, .this_id = 7,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,

4
drivers/scsi/g_NCR5380.c
View File

@ -56,7 +56,7 @@
#define NCR5380_intr generic_NCR5380_intr #define NCR5380_intr generic_NCR5380_intr
#define NCR5380_queue_command generic_NCR5380_queue_command #define NCR5380_queue_command generic_NCR5380_queue_command
#define NCR5380_abort generic_NCR5380_abort #define NCR5380_abort generic_NCR5380_abort
#define NCR5380_bus_reset generic_NCR5380_bus_reset #define NCR5380_host_reset generic_NCR5380_host_reset
#define NCR5380_info generic_NCR5380_info #define NCR5380_info generic_NCR5380_info
#define NCR5380_io_delay(x) udelay(x) #define NCR5380_io_delay(x) udelay(x)
@ -695,7 +695,7 @@ static struct scsi_host_template driver_template = {
.info = generic_NCR5380_info, .info = generic_NCR5380_info,
.queuecommand = generic_NCR5380_queue_command, .queuecommand = generic_NCR5380_queue_command,
.eh_abort_handler = generic_NCR5380_abort, .eh_abort_handler = generic_NCR5380_abort,
.eh_bus_reset_handler = generic_NCR5380_bus_reset, .eh_host_reset_handler = generic_NCR5380_host_reset,
.can_queue = 16, .can_queue = 16,
.this_id = 7, .this_id = 7,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,

4
drivers/scsi/mac_scsi.c
View File

@ -41,7 +41,7 @@
#define NCR5380_intr macscsi_intr #define NCR5380_intr macscsi_intr
#define NCR5380_queue_command macscsi_queue_command #define NCR5380_queue_command macscsi_queue_command
#define NCR5380_abort macscsi_abort #define NCR5380_abort macscsi_abort
#define NCR5380_bus_reset macscsi_bus_reset #define NCR5380_host_reset macscsi_host_reset
#define NCR5380_info macscsi_info #define NCR5380_info macscsi_info
#include "NCR5380.h" #include "NCR5380.h"
@ -328,7 +328,7 @@ static struct scsi_host_template mac_scsi_template = {
.info = macscsi_info, .info = macscsi_info,
.queuecommand = macscsi_queue_command, .queuecommand = macscsi_queue_command,
.eh_abort_handler = macscsi_abort, .eh_abort_handler = macscsi_abort,
.eh_bus_reset_handler = macscsi_bus_reset, .eh_host_reset_handler = macscsi_host_reset,
.can_queue = 16, .can_queue = 16,
.this_id = 7, .this_id = 7,
.sg_tablesize = 1, .sg_tablesize = 1,

4
drivers/scsi/sun3_scsi.c
View File

@ -46,7 +46,7 @@
#define NCR5380_write(reg, value) out_8(hostdata->io + (reg), value) #define NCR5380_write(reg, value) out_8(hostdata->io + (reg), value)
#define NCR5380_queue_command sun3scsi_queue_command #define NCR5380_queue_command sun3scsi_queue_command
#define NCR5380_bus_reset sun3scsi_bus_reset #define NCR5380_host_reset sun3scsi_host_reset
#define NCR5380_abort sun3scsi_abort #define NCR5380_abort sun3scsi_abort
#define NCR5380_info sun3scsi_info #define NCR5380_info sun3scsi_info
@ -495,7 +495,7 @@ static struct scsi_host_template sun3_scsi_template = {
.info = sun3scsi_info, .info = sun3scsi_info,
.queuecommand = sun3scsi_queue_command, .queuecommand = sun3scsi_queue_command,
.eh_abort_handler = sun3scsi_abort, .eh_abort_handler = sun3scsi_abort,
.eh_bus_reset_handler = sun3scsi_bus_reset, .eh_host_reset_handler = sun3scsi_host_reset,
.can_queue = 16, .can_queue = 16,
.this_id = 7, .this_id = 7,
.sg_tablesize = SG_NONE, .sg_tablesize = SG_NONE,