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

Commit 438be3c6 authored by Joe Perches's avatar Joe Perches Committed by Bjorn Helgaas
Browse files

PCI: Convert dev_printk(KERN_<LEVEL> to dev_<level>( 



dev_<level> calls take less code than dev_printk(KERN_<LEVEL>
and reducing object size is good.
Coalesce formats for easier grep.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 1f09b09b

drivers/pci/irq.c

+5 −5
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ static void pci_note_irq_problem(struct pci_dev *pdev, const char *reason) 
{

	struct pci_dev *parent = to_pci_dev(pdev->dev.parent);



	dev_printk(KERN_ERR, &pdev->dev,

	dev_err(&pdev->dev,

		"Potentially misrouted IRQ (Bridge %s %04x:%04x)\n",

		dev_name(&parent->dev), parent->vendor, parent->device);

	dev_printk(KERN_ERR, &pdev->dev, "%s\n", reason);

	dev_printk(KERN_ERR, &pdev->dev, "Please report to linux-kernel@vger.kernel.org\n");

	dev_err(&pdev->dev, "%s\n", reason);

	dev_err(&pdev->dev, "Please report to linux-kernel@vger.kernel.org\n");

	WARN_ON(1);

}

drivers/pci/pci-stub.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ MODULE_PARM_DESC(ids, "Initial PCI IDs to add to the stub driver, format is " 


static int pci_stub_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

	dev_printk(KERN_INFO, &dev->dev, "claimed by stub\n");

	dev_info(&dev->dev, "claimed by stub\n");

	return 0;

}

drivers/pci/pcie/aspm.c

+2 −5
Original line number Diff line number Diff line
@@ -242,8 +242,7 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link) 
		return;



	/* Training failed. Restore common clock configurations */

	dev_printk(KERN_ERR, &parent->dev,

		   "ASPM: Could not configure common clock\n");

	dev_err(&parent->dev, "ASPM: Could not configure common clock\n");

	list_for_each_entry(child, &linkbus->devices, bus_list)

		pcie_capability_write_word(child, PCI_EXP_LNKCTL,

					   child_reg[PCI_FUNC(child->devfn)]);
@@ -507,9 +506,7 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev) 
		 */

		pcie_capability_read_dword(child, PCI_EXP_DEVCAP, &reg32);

		if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) {

			dev_printk(KERN_INFO, &child->dev, "disabling ASPM"

				" on pre-1.1 PCIe device.  You can enable it"

				" with 'pcie_aspm=force'\n");

			dev_info(&child->dev, "disabling ASPM on pre-1.1 PCIe device.  You can enable it with 'pcie_aspm=force'\n");

			return -EINVAL;

		}

	}