summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-05-22 07:56:17 -0500
committerBjorn Helgaas <helgaas@kernel.org>2018-05-22 07:56:17 -0500
commit78f7aada6d56213f577c01d68c10ca564757dd0e (patch)
tree5e441b6ca39f495a63c54e4c6e0fe8deba17cbe0 /arch/xtensa
parentf242132bc440c71dd82dcb2112c95c97fffea976 (diff)
downloadlinux-stable-78f7aada6d56213f577c01d68c10ca564757dd0e.tar.gz
linux-stable-78f7aada6d56213f577c01d68c10ca564757dd0e.tar.bz2
linux-stable-78f7aada6d56213f577c01d68c10ca564757dd0e.zip
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>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/kernel/pci.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index e121b555fdb4..21f13e9aabe1 100644
--- 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);
}