From: Hannes Reinecke <hare@suse.de>
To: Christoph Hellwig <hch@lst.de>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>,
Hannes Reinecke <hare@suse.com>
Subject: [PATCH 15/28] NCR5380: Move bus reset to host reset
Date: Wed, 28 Jun 2017 10:25:03 +0200 [thread overview]
Message-ID: <1498638316-44420-16-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1498638316-44420-1-git-send-email-hare@suse.de>
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>
---
drivers/scsi/NCR5380.c | 4 ++--
drivers/scsi/arm/cumana_1.c | 2 +-
drivers/scsi/arm/oak.c | 2 +-
drivers/scsi/atari_scsi.c | 6 +++---
drivers/scsi/dmx3191d.c | 2 +-
drivers/scsi/g_NCR5380.c | 4 ++--
drivers/scsi/mac_scsi.c | 4 ++--
drivers/scsi/sun3_scsi.c | 4 ++--
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index acc3344..8a08122 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -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);
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index a87b99c..ae1d809 100644
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -216,7 +216,7 @@ static void cumanascsi_write(struct NCR5380_hostdata *hostdata,
.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,
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index 6be6666..05b7f75 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -105,7 +105,7 @@ static inline int oakscsi_pread(struct NCR5380_hostdata *hostdata,
.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,
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index a75feeb..89f5154 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -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 int atari_scsi_bus_reset(struct scsi_cmnd *cmd)
.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,
diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index 6af3394..003c3d7 100644
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -58,7 +58,7 @@
.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,
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index c34fc91..4965a46 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -54,7 +54,7 @@
#define NCR5380_intr generic_NCR5380_intr
#define NCR5380_queue_command generic_NCR5380_queue_command
#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_io_delay(x) udelay(x)
@@ -661,7 +661,7 @@ static int generic_NCR5380_dma_xfer_len(struct NCR5380_hostdata *hostdata,
.info = generic_NCR5380_info,
.queuecommand = generic_NCR5380_queue_command,
.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,
.this_id = 7,
.sg_tablesize = SG_ALL,
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 196acc7..dd60573 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -41,7 +41,7 @@
#define NCR5380_intr macscsi_intr
#define NCR5380_queue_command macscsi_queue_command
#define NCR5380_abort macscsi_abort
-#define NCR5380_bus_reset macscsi_bus_reset
+#define NCR5380_host_reset macscsi_host_reset
#define NCR5380_info macscsi_info
#include "NCR5380.h"
@@ -328,7 +328,7 @@ static int macscsi_dma_residual(struct NCR5380_hostdata *hostdata)
.info = macscsi_info,
.queuecommand = macscsi_queue_command,
.eh_abort_handler = macscsi_abort,
- .eh_bus_reset_handler = macscsi_bus_reset,
+ .eh_host_reset_handler = macscsi_host_reset,
.can_queue = 16,
.this_id = 7,
.sg_tablesize = 1,
diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index e64b0c5..9492638 100644
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -46,7 +46,7 @@
#define NCR5380_write(reg, value) out_8(hostdata->io + (reg), value)
#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_info sun3scsi_info
@@ -495,7 +495,7 @@ static int sun3scsi_dma_finish(int write_flag)
.info = sun3scsi_info,
.queuecommand = sun3scsi_queue_command,
.eh_abort_handler = sun3scsi_abort,
- .eh_bus_reset_handler = sun3scsi_bus_reset,
+ .eh_host_reset_handler = sun3scsi_host_reset,
.can_queue = 16,
.this_id = 7,
.sg_tablesize = SG_NONE,
--
1.8.5.6
next prev parent reply other threads:[~2017-06-28 8:31 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-28 8:24 [PATCH 00/28] SCSI EH argument reshuffle part I Hannes Reinecke
2017-06-28 8:24 ` [PATCH 01/28] scsi: fix comment in scsi_device_set_state() Hannes Reinecke
2017-06-28 8:36 ` Johannes Thumshirn
2017-06-28 13:54 ` Christoph Hellwig
2017-06-28 8:24 ` [PATCH 02/28] mptfc: Do not call fc_block_scsi_eh() on host reset Hannes Reinecke
2017-06-28 8:36 ` Johannes Thumshirn
2017-06-28 8:24 ` [PATCH 03/28] ibmvfc: " Hannes Reinecke
2017-06-28 8:37 ` Johannes Thumshirn
2017-06-28 8:24 ` [PATCH 04/28] fc_fcp: do not call fc_block_scsi_eh() from " Hannes Reinecke
2017-06-28 8:37 ` Johannes Thumshirn
2017-06-28 8:24 ` [PATCH 05/28] fnic: do not call host reset from command abort Hannes Reinecke
2017-06-28 8:38 ` Johannes Thumshirn
2017-06-28 8:24 ` [PATCH 06/28] uas: move eh_bus_reset_handler to eh_device_reset_handler Hannes Reinecke
2017-06-28 8:39 ` Johannes Thumshirn
2017-06-28 8:24 ` [PATCH 07/28] libsas: move bus_reset_handler() to target_reset_handler() Hannes Reinecke
2017-06-28 8:41 ` Johannes Thumshirn
2017-06-28 8:24 ` [PATCH 08/28] bfa: move bus reset to target reset Hannes Reinecke
2017-06-28 8:44 ` Johannes Thumshirn
2017-06-28 8:24 ` [PATCH 09/28] hptiop: Simplify reset handling Hannes Reinecke
2017-06-28 8:45 ` Johannes Thumshirn
2017-06-28 8:24 ` [PATCH 10/28] fdomain: move bus reset to host reset Hannes Reinecke
2017-06-28 8:45 ` Johannes Thumshirn
2017-06-28 13:55 ` Christoph Hellwig
2017-06-28 8:24 ` [PATCH 11/28] scsi: drop bus reset for wd33c93-compatible boards Hannes Reinecke
2017-06-28 8:46 ` Johannes Thumshirn
2017-06-28 13:56 ` Christoph Hellwig
2017-06-28 8:25 ` [PATCH 12/28] rtsx: drop bus reset function Hannes Reinecke
2017-06-28 8:47 ` Johannes Thumshirn
2017-06-28 8:25 ` [PATCH 13/28] qlogicpti: move bus reset to host reset Hannes Reinecke
2017-06-28 8:54 ` Johannes Thumshirn
2017-06-28 8:25 ` [PATCH 14/28] acornscsi: " Hannes Reinecke
2017-06-28 8:55 ` Johannes Thumshirn
2017-06-28 8:25 ` Hannes Reinecke [this message]
2017-06-28 8:55 ` [PATCH 15/28] NCR5380: Move " Johannes Thumshirn
2017-06-28 13:57 ` Christoph Hellwig
2017-06-28 8:25 ` [PATCH 16/28] qlogicfas: move bus_reset to host_reset Hannes Reinecke
2017-06-28 8:56 ` Johannes Thumshirn
2017-06-28 8:25 ` [PATCH 17/28] imm: drop duplicate bus_reset handler Hannes Reinecke
2017-06-28 8:58 ` Johannes Thumshirn
2017-06-28 13:57 ` Christoph Hellwig
2017-06-28 8:25 ` [PATCH 18/28] ppa: " Hannes Reinecke
2017-06-28 8:58 ` Johannes Thumshirn
2017-06-28 13:58 ` Christoph Hellwig
2017-06-28 8:25 ` [PATCH 19/28] qedf: drop bus reset handler Hannes Reinecke
2017-06-28 13:58 ` Christoph Hellwig
2017-06-28 14:07 ` Chad Dupuis
2017-06-28 14:37 ` Christoph Hellwig
2017-06-28 15:05 ` Chad Dupuis
2017-06-28 8:25 ` [PATCH 20/28] nsp32: drop bus reset Hannes Reinecke
2017-06-28 8:59 ` Johannes Thumshirn
2017-06-28 14:00 ` Christoph Hellwig
2017-06-28 8:25 ` [PATCH 21/28] aha152x: " Hannes Reinecke
2017-06-28 9:00 ` Johannes Thumshirn
2017-06-28 14:02 ` Christoph Hellwig
2017-06-28 8:25 ` [PATCH 22/28] 53c700: move bus reset to host reset Hannes Reinecke
2017-06-28 14:05 ` Christoph Hellwig
2017-06-28 8:25 ` [PATCH 23/28] bnx2fc: remove obsolete bnx2fc_eh_host_reset() definition Hannes Reinecke
2017-06-28 9:01 ` Johannes Thumshirn
2017-06-28 8:25 ` [PATCH 24/28] megaraid_mbox: drop duplicate bus reset and device reset function Hannes Reinecke
2017-06-28 9:01 ` Johannes Thumshirn
2017-06-28 14:05 ` Christoph Hellwig
2017-06-28 8:25 ` [PATCH 25/28] lpfc: drop lpfc_no_handler and lpfc_bus_reset_handler() Hannes Reinecke
2017-06-28 8:25 ` [PATCH 26/28] visorhba: sanitze private device data allocation Hannes Reinecke
2017-06-30 20:16 ` Kershner, David A
[not found] ` <CY4PR07MB3176109C5BDB7B51AD3BB73FF0A60@CY4PR07MB3176.namprd07.prod.outlook.com>
2017-07-24 9:28 ` Hannes Reinecke
2017-06-28 8:25 ` [PATCH 27/28] eata: remove 'arg_done' from eata2x_eh_host_reset() Hannes Reinecke
2017-06-28 9:03 ` Johannes Thumshirn
2017-06-28 14:06 ` Christoph Hellwig
2017-06-28 8:25 ` [PATCH 28/28] NCR5380: Clear all unissued commands on host reset Hannes Reinecke
2017-06-28 9:04 ` Johannes Thumshirn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1498638316-44420-16-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=hare@suse.com \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox