xtensa/PCI: Use dev_printk() when possible

Use the pci_info() and pci_err() wrappers for dev_printk() when possible.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index e121b555fdb4ee50c882a8a409115ba96279bc8c..21f13e9aabe1b5f660cdb54b5d077f31c08c8e34 100644 (file)
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -179,8 +179,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
        for (idx=0; idx<6; idx++) {
                r = &dev->resource[idx];
                if (!r->start && r->end) {
-                       pr_err("PCI: Device %s not available because "
-                              "of resource collisions\n", pci_name(dev));
+                       pci_err(dev, "can't enable device: resource collisions\n");
                        return -EINVAL;
                }
                if (r->flags & IORESOURCE_IO)
@@ -189,8 +188,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
                        cmd |= PCI_COMMAND_MEMORY;
        }
        if (cmd != old_cmd) {
-               pr_info("PCI: Enabling device %s (%04x -> %04x)\n",
-                       pci_name(dev), old_cmd, cmd);
+               pci_info(dev, "enabling device (%04x -> %04x)\n", old_cmd, cmd);
                pci_write_config_word(dev, PCI_COMMAND, cmd);
        }