On Tue, Nov 24, 2020 at 5:36 AM Joe Perches <joe@xxxxxxxxxxx> wrote:
>
> Use the more common logging style.
>
> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Acked-by: Jack Wang <jinpu.wang@xxxxxxxxxxxxxxx>
Thanks!
> ---
> drivers/scsi/pm8001/pm8001_init.c | 12 ++++++------
> drivers/scsi/pm8001/pm8001_sas.c | 4 ++--
> drivers/scsi/pm8001/pm8001_sas.h | 4 ++--
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
> index 13530d7fb8a6..38907f45c845 100644
> --- a/drivers/scsi/pm8001/pm8001_init.c
> +++ b/drivers/scsi/pm8001/pm8001_init.c
> @@ -1293,8 +1293,8 @@ static int pm8001_pci_suspend(struct pci_dev *pdev, pm_message_t state)
> tasklet_kill(&pm8001_ha->tasklet[j]);
> #endif
> device_state = pci_choose_state(pdev, state);
> - pm8001_printk(pm8001_ha, "pdev=0x%p, slot=%s, entering operating state [D%d]\n",
> - pdev, pm8001_ha->name, device_state);
> + pm8001_info(pm8001_ha, "pdev=0x%p, slot=%s, entering operating state [D%d]\n",
> + pdev, pm8001_ha->name, device_state);
> pci_save_state(pdev);
> pci_disable_device(pdev);
> pci_set_power_state(pdev, device_state);
> @@ -1318,16 +1318,16 @@ static int pm8001_pci_resume(struct pci_dev *pdev)
> pm8001_ha = sha->lldd_ha;
> device_state = pdev->current_state;
>
> - pm8001_printk(pm8001_ha, "pdev=0x%p, slot=%s, resuming from previous operating state [D%d]\n",
> - pdev, pm8001_ha->name, device_state);
> + pm8001_info(pm8001_ha, "pdev=0x%p, slot=%s, resuming from previous operating state [D%d]\n",
> + pdev, pm8001_ha->name, device_state);
>
> pci_set_power_state(pdev, PCI_D0);
> pci_enable_wake(pdev, PCI_D0, 0);
> pci_restore_state(pdev);
> rc = pci_enable_device(pdev);
> if (rc) {
> - pm8001_printk(pm8001_ha, "slot=%s Enable device failed during resume\n",
> - pm8001_ha->name);
> + pm8001_info(pm8001_ha, "slot=%s Enable device failed during resume\n",
> + pm8001_ha->name);
> goto err_out_enable;
> }
>
> diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
> index 4562b0a5062a..d1e9dba2ef19 100644
> --- a/drivers/scsi/pm8001/pm8001_sas.c
> +++ b/drivers/scsi/pm8001/pm8001_sas.c
> @@ -1191,7 +1191,7 @@ int pm8001_abort_task(struct sas_task *task)
> phy_id = pm8001_dev->attached_phy;
> ret = pm8001_find_tag(task, &tag);
> if (ret == 0) {
> - pm8001_printk(pm8001_ha, "no tag for task:%p\n", task);
> + pm8001_info(pm8001_ha, "no tag for task:%p\n", task);
> return TMF_RESP_FUNC_FAILED;
> }
> spin_lock_irqsave(&task->task_state_lock, flags);
> @@ -1313,7 +1313,7 @@ int pm8001_abort_task(struct sas_task *task)
> task->slow_task = NULL;
> spin_unlock_irqrestore(&task->task_state_lock, flags);
> if (rc != TMF_RESP_FUNC_COMPLETE)
> - pm8001_printk(pm8001_ha, "rc= %d\n", rc);
> + pm8001_info(pm8001_ha, "rc= %d\n", rc);
> return rc;
> }
>
> diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h
> index 5266756a268b..f2c8cbad3853 100644
> --- a/drivers/scsi/pm8001/pm8001_sas.h
> +++ b/drivers/scsi/pm8001/pm8001_sas.h
> @@ -70,14 +70,14 @@
> #define PM8001_DEVIO_LOGGING 0x100 /* development io message logging */
> #define PM8001_IOERR_LOGGING 0x200 /* development io err message logging */
>
> -#define pm8001_printk(HBA, fmt, ...) \
> +#define pm8001_info(HBA, fmt, ...) \
> pr_info("%s:: %s %d:" fmt, \
> (HBA)->name, __func__, __LINE__, ##__VA_ARGS__)
>
> #define pm8001_dbg(HBA, level, fmt, ...) \
> do { \
> if (unlikely((HBA)->logging_level & PM8001_##level##_LOGGING)) \
> - pm8001_printk(HBA, fmt, ##__VA_ARGS__); \
> + pm8001_info(HBA, fmt, ##__VA_ARGS__); \
> } while (0)
>
> #define PM8001_USE_TASKLET
> --
> 2.26.0
>
