* [PATCH] scsi/qla4: comments correction
@ 2016-12-19 6:20 Cao jin
2016-12-22 11:34 ` Javali, Nilesh
2017-01-05 5:34 ` Martin K. Petersen
0 siblings, 2 replies; 3+ messages in thread
From: Cao jin @ 2016-12-19 6:20 UTC (permalink / raw)
To: QLogic-Storage-Upstream, linux-scsi; +Cc: jejb, martin.petersen
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
---
drivers/scsi/qla4xxx/ql4_os.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 01c3610a60cf..fc60e0a1043e 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -9546,15 +9546,15 @@ static int qla4xxx_host_reset(struct Scsi_Host *shost, int reset_type)
* driver calls the following device driver's callbacks
*
* - Fatal Errors - link_reset
- * - Non-Fatal Errors - driver's pci_error_detected() which
+ * - Non-Fatal Errors - driver's error_detected() which
* returns CAN_RECOVER, NEED_RESET or DISCONNECT.
*
* PCI AER driver calls
- * CAN_RECOVER - driver's pci_mmio_enabled(), mmio_enabled
+ * CAN_RECOVER - driver's mmio_enabled(), mmio_enabled()
* returns RECOVERED or NEED_RESET if fw_hung
* NEED_RESET - driver's slot_reset()
* DISCONNECT - device is dead & cannot recover
- * RECOVERED - driver's pci_resume()
+ * RECOVERED - driver's resume()
*/
static pci_ers_result_t
qla4xxx_pci_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] scsi/qla4: comments correction
2016-12-19 6:20 [PATCH] scsi/qla4: comments correction Cao jin
@ 2016-12-22 11:34 ` Javali, Nilesh
2017-01-05 5:34 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Javali, Nilesh @ 2016-12-22 11:34 UTC (permalink / raw)
To: Cao jin, QLogic-Storage-Upstream@qlogic.com,
linux-scsi@vger.kernel.org
Cc: jejb@linux.vnet.ibm.com, martin.petersen@oracle.com
On 19/12/16, 11:50 AM, "linux-scsi-owner@vger.kernel.org on behalf of Cao
jin" <linux-scsi-owner@vger.kernel.org on behalf of
caoj.fnst@cn.fujitsu.com> wrote:
>Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
>---
> drivers/scsi/qla4xxx/ql4_os.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
>index 01c3610a60cf..fc60e0a1043e 100644
>--- a/drivers/scsi/qla4xxx/ql4_os.c
>+++ b/drivers/scsi/qla4xxx/ql4_os.c
>@@ -9546,15 +9546,15 @@ static int qla4xxx_host_reset(struct Scsi_Host
>*shost, int reset_type)
> * driver calls the following device driver's callbacks
> *
> * - Fatal Errors - link_reset
>- * - Non-Fatal Errors - driver's pci_error_detected() which
>+ * - Non-Fatal Errors - driver's error_detected() which
> * returns CAN_RECOVER, NEED_RESET or DISCONNECT.
> *
> * PCI AER driver calls
>- * CAN_RECOVER - driver's pci_mmio_enabled(), mmio_enabled
>+ * CAN_RECOVER - driver's mmio_enabled(), mmio_enabled()
> * returns RECOVERED or NEED_RESET if fw_hung
> * NEED_RESET - driver's slot_reset()
> * DISCONNECT - device is dead & cannot recover
>- * RECOVERED - driver's pci_resume()
>+ * RECOVERED - driver's resume()
> */
> static pci_ers_result_t
> qla4xxx_pci_error_detected(struct pci_dev *pdev, pci_channel_state_t
>state)
>--
>2.1.0
Acked-by: Nilesh Javali <nilesh.javali@cavium.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] scsi/qla4: comments correction
2016-12-19 6:20 [PATCH] scsi/qla4: comments correction Cao jin
2016-12-22 11:34 ` Javali, Nilesh
@ 2017-01-05 5:34 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2017-01-05 5:34 UTC (permalink / raw)
To: Cao jin; +Cc: QLogic-Storage-Upstream, linux-scsi, jejb, martin.petersen
>>>>> "Cao" == Cao jin <caoj.fnst@cn.fujitsu.com> writes:
Cao> drivers/scsi/qla4xxx/ql4_os.c | 6 +++--- 1 file changed, 3
Cao> insertions(+), 3 deletions(-)
Applied to 4.11/scsi-queue.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-05 5:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-19 6:20 [PATCH] scsi/qla4: comments correction Cao jin
2016-12-22 11:34 ` Javali, Nilesh
2017-01-05 5:34 ` Martin K. Petersen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.