PCI: Add wrappers for dev_printk()

Add PCI-specific dev_printk() wrappers and use them to simplify the code
slightly.  No functional change intended.

Signed-off-by: Frederick Lawler <fred@fredlawl.com>
[bhelgaas: squash into one patch]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

1 files changed, 16 insertions, 20 deletions

diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
index 318baa507364..0373b9d88c6d 100644
--- a/drivers/pci/hotplug/pnv_php.c
+++ b/drivers/pci/hotplug/pnv_php.c
@@ -271,8 +271,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot)
 
         ret = pnv_pci_get_device_tree(php_slot->dn->phandle, fdt1, 0x10000);
         if (ret) {
-                dev_warn(&php_slot->pdev->dev, "Error %d getting FDT blob\n",
-                         ret);
+                pci_warn(php_slot->pdev, "Error %d getting FDT blob\n", ret);
                 goto free_fdt1;
         }
 
@@ -287,7 +286,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot)
         dt = of_fdt_unflatten_tree(fdt, php_slot->dn, NULL);
         if (!dt) {
                 ret = -EINVAL;
-                dev_warn(&php_slot->pdev->dev, "Cannot unflatten FDT\n");
+                pci_warn(php_slot->pdev, "Cannot unflatten FDT\n");
                 goto free_fdt;
         }
 
@@ -297,7 +296,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot)
         ret = pnv_php_populate_changeset(&php_slot->ocs, php_slot->dn);
         if (ret) {
                 pnv_php_reverse_nodes(php_slot->dn);
-                dev_warn(&php_slot->pdev->dev, "Error %d populating changeset\n",
+                pci_warn(php_slot->pdev, "Error %d populating changeset\n",
                          ret);
                 goto free_dt;
         }
@@ -305,8 +304,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot)
         php_slot->dn->child = NULL;
         ret = of_changeset_apply(&php_slot->ocs);
         if (ret) {
-                dev_warn(&php_slot->pdev->dev, "Error %d applying changeset\n",
-                         ret);
+                pci_warn(php_slot->pdev, "Error %d applying changeset\n", ret);
                 goto destroy_changeset;
         }
 
@@ -342,14 +340,14 @@ int pnv_php_set_slot_power_state(struct hotplug_slot *slot,
                 if (be64_to_cpu(msg.params[1]) != php_slot->dn->phandle ||
                     be64_to_cpu(msg.params[2]) != state                 ||
                     be64_to_cpu(msg.params[3]) != OPAL_SUCCESS) {
-                        dev_warn(&php_slot->pdev->dev, "Wrong msg (%lld, %lld, %lld)\n",
+                        pci_warn(php_slot->pdev, "Wrong msg (%lld, %lld, %lld)\n",
                                  be64_to_cpu(msg.params[1]),
                                  be64_to_cpu(msg.params[2]),
                                  be64_to_cpu(msg.params[3]));
                         return -ENOMSG;
                 }
         } else if (ret < 0) {
-                dev_warn(&php_slot->pdev->dev, "Error %d powering %s\n",
+                pci_warn(php_slot->pdev, "Error %d powering %s\n",
                          ret, (state == OPAL_PCI_SLOT_POWER_ON) ? "on" : "off");
                 return ret;
         }
@@ -376,7 +374,7 @@ static int pnv_php_get_power_state(struct hotplug_slot *slot, u8 *state)
          */
         ret = pnv_pci_get_power_state(php_slot->id, &power_state);
         if (ret) {
-                dev_warn(&php_slot->pdev->dev, "Error %d getting power status\n",
+                pci_warn(php_slot->pdev, "Error %d getting power status\n",
                          ret);
         } else {
                 *state = power_state;
@@ -402,8 +400,7 @@ static int pnv_php_get_adapter_state(struct hotplug_slot *slot, u8 *state)
                 slot->info->adapter_status = presence;
                 ret = 0;
         } else {
-                dev_warn(&php_slot->pdev->dev, "Error %d getting presence\n",
-                         ret);
+                pci_warn(php_slot->pdev, "Error %d getting presence\n", ret);
         }
 
         return ret;
@@ -626,8 +623,7 @@ static int pnv_php_register_slot(struct pnv_php_slot *php_slot)
         ret = pci_hp_register(&php_slot->slot, php_slot->bus,
                               php_slot->slot_no, php_slot->name);
         if (ret) {
-                dev_warn(&php_slot->pdev->dev, "Error %d registering slot\n",
-                         ret);
+                pci_warn(php_slot->pdev, "Error %d registering slot\n", ret);
                 return ret;
         }
 
@@ -680,7 +676,7 @@ static int pnv_php_enable_msix(struct pnv_php_slot *php_slot)
         /* Enable MSIx */
         ret = pci_enable_msix_exact(pdev, &entry, 1);
         if (ret) {
-                dev_warn(&pdev->dev, "Error %d enabling MSIx\n", ret);
+                pci_warn(pdev, "Error %d enabling MSIx\n", ret);
                 return ret;
         }
 
@@ -724,7 +720,7 @@ static irqreturn_t pnv_php_interrupt(int irq, void *data)
                    (sts & PCI_EXP_SLTSTA_PDC)) {
                 ret = pnv_pci_get_presence_state(php_slot->id, &presence);
                 if (ret) {
-                        dev_warn(&pdev->dev, "PCI slot [%s] error %d getting presence (0x%04x), to retry the operation.\n",
+                        pci_warn(pdev, "PCI slot [%s] error %d getting presence (0x%04x), to retry the operation.\n",
                                  php_slot->name, ret, sts);
                         return IRQ_HANDLED;
                 }
@@ -754,12 +750,12 @@ static irqreturn_t pnv_php_interrupt(int irq, void *data)
          */
         event = kzalloc(sizeof(*event), GFP_ATOMIC);
         if (!event) {
-                dev_warn(&pdev->dev, "PCI slot [%s] missed hotplug event 0x%04x\n",
+                pci_warn(pdev, "PCI slot [%s] missed hotplug event 0x%04x\n",
                          php_slot->name, sts);
                 return IRQ_HANDLED;
         }
 
-        dev_info(&pdev->dev, "PCI slot [%s] %s (IRQ: %d)\n",
+        pci_info(pdev, "PCI slot [%s] %s (IRQ: %d)\n",
                  php_slot->name, added ? "added" : "removed", irq);
         INIT_WORK(&event->work, pnv_php_event_handler);
         event->added = added;
@@ -779,7 +775,7 @@ static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq)
         /* Allocate workqueue */
         php_slot->wq = alloc_workqueue("pciehp-%s", 0, 0, php_slot->name);
         if (!php_slot->wq) {
-                dev_warn(&pdev->dev, "Cannot alloc workqueue\n");
+                pci_warn(pdev, "Cannot alloc workqueue\n");
                 pnv_php_disable_irq(php_slot, true);
                 return;
         }
@@ -803,7 +799,7 @@ static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq)
                           php_slot->name, php_slot);
         if (ret) {
                 pnv_php_disable_irq(php_slot, true);
-                dev_warn(&pdev->dev, "Error %d enabling IRQ %d\n", ret, irq);
+                pci_warn(pdev, "Error %d enabling IRQ %d\n", ret, irq);
                 return;
         }
 
@@ -839,7 +835,7 @@ static void pnv_php_enable_irq(struct pnv_php_slot *php_slot)
 
         ret = pci_enable_device(pdev);
         if (ret) {
-                dev_warn(&pdev->dev, "Error %d enabling device\n", ret);
+                pci_warn(pdev, "Error %d enabling device\n", ret);
                 return;
         }