From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>,
Hannes Reinecke <hare@suse.com>
Subject: [PATCHv2 10/26] fdomain: move bus reset to host reset
Date: Fri, 25 Aug 2017 13:57:05 +0200 [thread overview]
Message-ID: <1503662241-127788-11-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1503662241-127788-1-git-send-email-hare@suse.de>
The bus reset function really is a host reset, so move it to
eh_host_reset_handler().
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/scsi/fdomain.c | 6 +++---
drivers/scsi/fdomain.h | 2 +-
drivers/scsi/pcmcia/fdomain_stub.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index b87ab38..ebbe5a3 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -933,7 +933,7 @@ struct Scsi_Host *__fdomain_16x0_detect(struct scsi_host_template *tpnt )
}
}
- fdomain_16x0_bus_reset(NULL);
+ fdomain_16x0_host_reset(NULL);
if (fdomain_test_loopback()) {
printk(KERN_ERR "scsi: <fdomain> Detection failed (loopback test failed at port base 0x%x)\n", port_base);
@@ -1568,7 +1568,7 @@ static int fdomain_16x0_abort(struct scsi_cmnd *SCpnt)
return SUCCESS;
}
-int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt)
+int fdomain_16x0_host_reset(struct scsi_cmnd *SCpnt)
{
unsigned long flags;
@@ -1758,7 +1758,7 @@ struct scsi_host_template fdomain_driver_template = {
.info = fdomain_16x0_info,
.queuecommand = fdomain_16x0_queue,
.eh_abort_handler = fdomain_16x0_abort,
- .eh_bus_reset_handler = fdomain_16x0_bus_reset,
+ .eh_host_reset_handler = fdomain_16x0_host_reset,
.bios_param = fdomain_16x0_biosparam,
.release = fdomain_16x0_release,
.can_queue = 1,
diff --git a/drivers/scsi/fdomain.h b/drivers/scsi/fdomain.h
index 47021d9..5cbe86b 100644
--- a/drivers/scsi/fdomain.h
+++ b/drivers/scsi/fdomain.h
@@ -21,4 +21,4 @@
extern struct scsi_host_template fdomain_driver_template;
extern int fdomain_setup(char *str);
extern struct Scsi_Host *__fdomain_16x0_detect(struct scsi_host_template *tpnt );
-extern int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt);
+extern int fdomain_16x0_host_reset(struct scsi_cmnd *SCpnt);
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index 714b248..953a792 100644
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -173,7 +173,7 @@ static void fdomain_release(struct pcmcia_device *link)
static int fdomain_resume(struct pcmcia_device *link)
{
- fdomain_16x0_bus_reset(NULL);
+ fdomain_16x0_host_reset(NULL);
return 0;
}
--
1.8.5.6
next prev parent reply other threads:[~2017-08-25 11:58 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-25 11:56 [PATCHv2 00/26] SCSI EH argument reshuffle part I Hannes Reinecke
2017-08-25 11:56 ` [PATCHv2 01/26] scsi: fix comment in scsi_device_set_state() Hannes Reinecke
2017-08-25 11:56 ` [PATCHv2 02/26] mptfc: Do not call fc_block_scsi_eh() on host reset Hannes Reinecke
2017-08-25 11:56 ` [PATCHv2 03/26] ibmvfc: " Hannes Reinecke
2017-08-25 11:56 ` [PATCHv2 04/26] fc_fcp: do not call fc_block_scsi_eh() from " Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 05/26] fnic: do not call host reset from command abort Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 06/26] uas: move eh_bus_reset_handler to eh_device_reset_handler Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 07/26] libsas: move bus_reset_handler() to target_reset_handler() Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 08/26] bfa: move bus reset to target reset Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 09/26] hptiop: Simplify reset handling Hannes Reinecke
2017-08-25 11:57 ` Hannes Reinecke [this message]
2017-08-25 11:57 ` [PATCHv2 11/26] scsi: drop bus reset for wd33c93-compatible boards Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 12/26] rtsx: drop bus reset function Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 13/26] qlogicpti: move bus reset to host reset Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 14/26] acornscsi: " Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 15/26] NCR5380: Move " Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 16/26] qlogicfas: move bus_reset to host_reset Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 17/26] imm: drop duplicate bus_reset handler Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 18/26] ppa: " Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 19/26] qedf: drop bus reset handler Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 20/26] nsp32: drop bus reset Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 21/26] aha152x: drop host reset Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 22/26] 53c700: move bus reset to " Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 23/26] bnx2fc: remove obsolete bnx2fc_eh_host_reset() definition Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 24/26] megaraid_mbox: drop duplicate bus reset and device reset function Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 25/26] visorhba: sanitze private device data allocation Hannes Reinecke
2017-08-25 11:57 ` [PATCHv2 26/26] eata: remove 'arg_done' from eata2x_eh_host_reset() Hannes Reinecke
2017-08-25 21:22 ` [PATCHv2 00/26] SCSI EH argument reshuffle part I Martin K. Petersen
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=1503662241-127788-11-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