Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/mips/pci/pci-legacy.c

+3 −5
Original line number Diff line number Diff line
@@ -263,9 +263,8 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) 
				(!(r->flags & IORESOURCE_ROM_ENABLE)))

			continue;

		if (!r->start && r->end) {

			printk(KERN_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)
@@ -274,8 +273,7 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) 
			cmd |= PCI_COMMAND_MEMORY;

	}

	if (cmd != old_cmd) {

		printk("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);

	}

	return 0;