scsi: pm8001: Make implicit use of pm8001_ha in pm8001_printk() explicit

Make the pm8001_printk() macro take an explicit HBA instead of assuming the
existence of an unspecified pm8001_ha argument.

Miscellanea:

 - Add pm8001_ha to the few uses of pm8001_printk()

 - Add HBA to the pm8001_dbg macro call to pm8001_printk()

Link: https://lore.kernel.org/r/0e17a4c845f15e18f98b346ffb9b039584d21cdd.1605914030.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 43ba558426029a49eb3c226cf1b251237b39bf12..a6b3f1f8c806dca4ae2995c94bd19453a24b00e6 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -1293,9 +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("pdev=0x%p, slot=%s, entering "
-                     "operating state [D%d]\n", pdev,
-                     pm8001_ha->name, device_state);
+       pm8001_printk(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);
@@ -1319,15 +1318,15 @@ static int pm8001_pci_resume(struct pci_dev *pdev)
        pm8001_ha = sha->lldd_ha;
        device_state = pdev->current_state;
 
-       pm8001_printk("pdev=0x%p, slot=%s, resuming from previous "
-               "operating state [D%d]\n", pdev, pm8001_ha->name, device_state);
+       pm8001_printk(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("slot=%s Enable device failed during resume\n",
+               pm8001_printk(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 505a885b4c77a20114dd28342931d3202ddcc4a1..4562b0a5062a38d4525b90997461a4b23138a645 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("no tag for task:%p\n", task);
+               pm8001_printk(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("rc= %d\n", rc);
+               pm8001_printk(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 5cd6fe6a7d2d9fc02afd86f594ced032e2c9c2ee..5266756a268be1c0b8e25d249c57fd53659fb091 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(fmt, ...)                                                \
+#define pm8001_printk(HBA, fmt, ...)                                   \
        pr_info("%s:: %s  %d:" fmt,                                     \
-               pm8001_ha->name, __func__, __LINE__, ##__VA_ARGS__)
+               (HBA)->name, __func__, __LINE__, ##__VA_ARGS__)
 
 #define pm8001_dbg(HBA, level, fmt, ...)                               \
 do {                                                                   \
        if (unlikely((HBA)->logging_level & PM8001_##level##_LOGGING))  \
-               pm8001_printk(fmt, ##__VA_ARGS__);                      \
+               pm8001_printk(HBA, fmt, ##__VA_ARGS__);                 \
 } while (0)
 
 #define PM8001_USE_TASKLET