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.com>
Subject: [PATCHv2 16/26] qlogicfas: move bus_reset to host_reset
Date: Fri, 25 Aug 2017 13:57:11 +0200 [thread overview]
Message-ID: <1503662241-127788-17-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1503662241-127788-1-git-send-email-hare@suse.de>
From: Hannes Reinecke <hare@suse.com>
The bus reset handler is really a host reset.
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/scsi/pcmcia/qlogic_stub.c | 4 ++--
drivers/scsi/qlogicfas.c | 2 +-
drivers/scsi/qlogicfas408.c | 6 +++---
drivers/scsi/qlogicfas408.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index c670dc7..0556054 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -67,7 +67,7 @@
.info = qlogicfas408_info,
.queuecommand = qlogicfas408_queuecommand,
.eh_abort_handler = qlogicfas408_abort,
- .eh_bus_reset_handler = qlogicfas408_bus_reset,
+ .eh_host_reset_handler = qlogicfas408_host_reset,
.bios_param = qlogicfas408_biosparam,
.can_queue = 1,
.this_id = -1,
@@ -264,7 +264,7 @@ static int qlogic_resume(struct pcmcia_device *link)
outb(0x04, link->resource[0]->start + 0xd);
}
/* Ugggglllyyyy!!! */
- qlogicfas408_bus_reset(NULL);
+ qlogicfas408_host_reset(NULL);
return 0;
}
diff --git a/drivers/scsi/qlogicfas.c b/drivers/scsi/qlogicfas.c
index 840823b..95431d6 100644
--- a/drivers/scsi/qlogicfas.c
+++ b/drivers/scsi/qlogicfas.c
@@ -188,7 +188,7 @@ static int qlogicfas_release(struct Scsi_Host *shost)
.info = qlogicfas408_info,
.queuecommand = qlogicfas408_queuecommand,
.eh_abort_handler = qlogicfas408_abort,
- .eh_bus_reset_handler = qlogicfas408_bus_reset,
+ .eh_host_reset_handler = qlogicfas408_host_reset,
.bios_param = qlogicfas408_biosparam,
.can_queue = 1,
.this_id = -1,
diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c
index c3a9151..8b471a9 100644
--- a/drivers/scsi/qlogicfas408.c
+++ b/drivers/scsi/qlogicfas408.c
@@ -496,13 +496,13 @@ int qlogicfas408_abort(struct scsi_cmnd *cmd)
return SUCCESS;
}
-/*
+/*
* Reset SCSI bus
* FIXME: This function is invoked with cmd = NULL directly by
* the PCMCIA qlogic_stub code. This wants fixing
*/
-int qlogicfas408_bus_reset(struct scsi_cmnd *cmd)
+int qlogicfas408_host_reset(struct scsi_cmnd *cmd)
{
struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
unsigned long flags;
@@ -607,7 +607,7 @@ static void __exit qlogicfas408_exit(void)
EXPORT_SYMBOL(qlogicfas408_info);
EXPORT_SYMBOL(qlogicfas408_queuecommand);
EXPORT_SYMBOL(qlogicfas408_abort);
-EXPORT_SYMBOL(qlogicfas408_bus_reset);
+EXPORT_SYMBOL(qlogicfas408_host_reset);
EXPORT_SYMBOL(qlogicfas408_biosparam);
EXPORT_SYMBOL(qlogicfas408_ihandl);
EXPORT_SYMBOL(qlogicfas408_get_chip_type);
diff --git a/drivers/scsi/qlogicfas408.h b/drivers/scsi/qlogicfas408.h
index 2f6c0a1..f6b1216 100644
--- a/drivers/scsi/qlogicfas408.h
+++ b/drivers/scsi/qlogicfas408.h
@@ -108,7 +108,7 @@ int qlogicfas408_biosparam(struct scsi_device * disk,
struct block_device *dev,
sector_t capacity, int ip[]);
int qlogicfas408_abort(struct scsi_cmnd * cmd);
-int qlogicfas408_bus_reset(struct scsi_cmnd * cmd);
+extern int qlogicfas408_host_reset(struct scsi_cmnd *cmd);
const char *qlogicfas408_info(struct Scsi_Host *host);
int qlogicfas408_get_chip_type(int qbase, int int_type);
void qlogicfas408_setup(int qbase, int id, int int_type);
--
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 ` [PATCHv2 10/26] fdomain: move bus reset to host reset Hannes Reinecke
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 ` Hannes Reinecke [this message]
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-17-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