scsi: pm8001: Convert pm8001_printk() to pm8001_info()

Use the more common logging style.

[mkp: fixed a few conflicts]

Link: https://lore.kernel.org/r/69dc34ff63adfa60b3f203ed2d58143b5692af57.1606192458.git.joe@perches.com
Acked-by: Jack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index 9627dcf5ffac7103044e7069ccfccb0ce51c1f5e..aaac127044754f3e67f3a600c151c7ff8ca2810e 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -1290,7 +1290,7 @@ static int __maybe_unused pm8001_pci_suspend(struct device *dev)
                for (j = 0; j < PM8001_MAX_MSIX_VEC; j++)
                        tasklet_kill(&pm8001_ha->tasklet[j]);
 #endif
-       pm8001_printk(pm8001_ha, "pdev=0x%p, slot=%s, entering "
+       pm8001_info(pm8001_ha, "pdev=0x%p, slot=%s, entering "
                      "suspended state\n", pdev,
                      pm8001_ha->name);
        return 0;
@@ -1314,7 +1314,7 @@ static int __maybe_unused pm8001_pci_resume(struct device *dev)
        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",
+       pm8001_info(pm8001_ha, "pdev=0x%p, slot=%s, resuming from previous operating state [D%d]\n",
                      pdev, pm8001_ha->name, device_state);
 
        rc = pci_go_44(pdev);

diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index 4562b0a5062a38d4525b90997461a4b23138a645..d1e9dba2ef193324f1e1a98e36d569e0902f92e2 100644 (file)
--- 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 @@ out:
                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 5266756a268be1c0b8e25d249c57fd53659fb091..f2c8cbad3853466143c5148ed3b9bac022fe78e0 100644 (file)
--- 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