Commit 77edfac4 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas

MIPS: PCI: Use dev_printk() when possible

Use the pci_info() and pci_err() wrappers for dev_printk() when possible.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarJames Hogan <jhogan@kernel.org>
parent 78f7aada
...@@ -263,9 +263,8 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) ...@@ -263,9 +263,8 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)
(!(r->flags & IORESOURCE_ROM_ENABLE))) (!(r->flags & IORESOURCE_ROM_ENABLE)))
continue; continue;
if (!r->start && r->end) { if (!r->start && r->end) {
printk(KERN_ERR "PCI: Device %s not available " pci_err(dev,
"because of resource collisions\n", "can't enable device: resource collisions\n");
pci_name(dev));
return -EINVAL; return -EINVAL;
} }
if (r->flags & IORESOURCE_IO) if (r->flags & IORESOURCE_IO)
...@@ -274,8 +273,7 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) ...@@ -274,8 +273,7 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)
cmd |= PCI_COMMAND_MEMORY; cmd |= PCI_COMMAND_MEMORY;
} }
if (cmd != old_cmd) { if (cmd != old_cmd) {
printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_info(dev, "enabling device (%04x -> %04x)\n", old_cmd, cmd);
pci_name(dev), old_cmd, cmd);
pci_write_config_word(dev, PCI_COMMAND, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment