Convert the remaining %pf users to %ps to prepare for the removal of the
old %pf conversion specifier support.
Fixes: 323506644972 ("scsi: lpfc: Migrate to %px and %pf in kernel print calls")
Signed-off-by: Sakari Ailus <[email protected]>
---
drivers/scsi/lpfc/lpfc_hbadisc.c | 4 ++--
drivers/scsi/lpfc/lpfc_sli.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index e7463d561f305..749286acdc173 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -6051,7 +6051,7 @@ __lpfc_find_node(struct lpfc_vport *vport, node_filter filter, void *param)
list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {
if (filter(ndlp, param)) {
lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,
- "3185 FIND node filter %pf DID "
+ "3185 FIND node filter %ps DID "
"ndlp x%px did x%x flg x%x st x%x "
"xri x%x type x%x rpi x%x\n",
filter, ndlp, ndlp->nlp_DID,
@@ -6062,7 +6062,7 @@ __lpfc_find_node(struct lpfc_vport *vport, node_filter filter, void *param)
}
}
lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,
- "3186 FIND node filter %pf NOT FOUND.\n", filter);
+ "3186 FIND node filter %ps NOT FOUND.\n", filter);
return NULL;
}
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index bb5705267c395..2ff0879a95126 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -2712,7 +2712,7 @@ lpfc_sli_handle_mb_event(struct lpfc_hba *phba)
/* Mailbox cmd <cmd> Cmpl <cmpl> */
lpfc_printf_log(phba, KERN_INFO, LOG_MBOX | LOG_SLI,
- "(%d):0307 Mailbox cmd x%x (x%x/x%x) Cmpl %pf "
+ "(%d):0307 Mailbox cmd x%x (x%x/x%x) Cmpl %ps "
"Data: x%x x%x x%x x%x x%x x%x x%x x%x x%x "
"x%x x%x x%x\n",
pmb->vport ? pmb->vport->vpi : 0,
--
2.20.1
On Wed, Sep 04, 2019 at 07:04:23PM +0300, Sakari Ailus wrote:
> Convert the remaining %pf users to %ps to prepare for the removal of the
> old %pf conversion specifier support.
FWIW,
Reviewed-by: Andy Shevchenko <[email protected]>
> Fixes: 323506644972 ("scsi: lpfc: Migrate to %px and %pf in kernel print calls")
> Signed-off-by: Sakari Ailus <[email protected]>
> ---
> drivers/scsi/lpfc/lpfc_hbadisc.c | 4 ++--
> drivers/scsi/lpfc/lpfc_sli.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
> index e7463d561f305..749286acdc173 100644
> --- a/drivers/scsi/lpfc/lpfc_hbadisc.c
> +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
> @@ -6051,7 +6051,7 @@ __lpfc_find_node(struct lpfc_vport *vport, node_filter filter, void *param)
> list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {
> if (filter(ndlp, param)) {
> lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,
> - "3185 FIND node filter %pf DID "
> + "3185 FIND node filter %ps DID "
> "ndlp x%px did x%x flg x%x st x%x "
> "xri x%x type x%x rpi x%x\n",
> filter, ndlp, ndlp->nlp_DID,
> @@ -6062,7 +6062,7 @@ __lpfc_find_node(struct lpfc_vport *vport, node_filter filter, void *param)
> }
> }
> lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,
> - "3186 FIND node filter %pf NOT FOUND.\n", filter);
> + "3186 FIND node filter %ps NOT FOUND.\n", filter);
> return NULL;
> }
>
> diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
> index bb5705267c395..2ff0879a95126 100644
> --- a/drivers/scsi/lpfc/lpfc_sli.c
> +++ b/drivers/scsi/lpfc/lpfc_sli.c
> @@ -2712,7 +2712,7 @@ lpfc_sli_handle_mb_event(struct lpfc_hba *phba)
>
> /* Mailbox cmd <cmd> Cmpl <cmpl> */
> lpfc_printf_log(phba, KERN_INFO, LOG_MBOX | LOG_SLI,
> - "(%d):0307 Mailbox cmd x%x (x%x/x%x) Cmpl %pf "
> + "(%d):0307 Mailbox cmd x%x (x%x/x%x) Cmpl %ps "
> "Data: x%x x%x x%x x%x x%x x%x x%x x%x x%x "
> "x%x x%x x%x\n",
> pmb->vport ? pmb->vport->vpi : 0,
> --
> 2.20.1
>
--
With Best Regards,
Andy Shevchenko
On 9/4/2019 9:04 AM, Sakari Ailus wrote:
> Convert the remaining %pf users to %ps to prepare for the removal of the
> old %pf conversion specifier support.
>
> Fixes: 323506644972 ("scsi: lpfc: Migrate to %px and %pf in kernel print calls")
> Signed-off-by: Sakari Ailus <[email protected]>
> ---
> drivers/scsi/lpfc/lpfc_hbadisc.c | 4 ++--
> drivers/scsi/lpfc/lpfc_sli.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>
Reviewed by: James Smart <[email protected]>
-- james
Sakari,
> Convert the remaining %pf users to %ps to prepare for the removal of
> the old %pf conversion specifier support.
Applied to 5.4/scsi-queue, thanks!
--
Martin K. Petersen Oracle Linux Engineering
On Sat, Sep 07, 2019 at 04:27:34PM -0400, Martin K. Petersen wrote:
>
> Sakari,
>
> > Convert the remaining %pf users to %ps to prepare for the removal of
> > the old %pf conversion specifier support.
>
> Applied to 5.4/scsi-queue, thanks!
Thanks, Martin!
--
Sakari Ailus
[email protected]