Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 438be3c6b76fa129731a320ec7f0bb3d530bcb50

Authored by Joe Perches
Committed by Bjorn Helgaas
1 parent 1f09b09b4d
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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: Joe Perches <joe@perches.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

Showing 3 changed files with 8 additions and 11 deletions Side-by-side Diff

... ... @@ -14,11 +14,11 @@
14 14 {
15 15 struct pci_dev *parent = to_pci_dev(pdev->dev.parent);
16 16  
17   - dev_printk(KERN_ERR, &pdev->dev,
18   - "Potentially misrouted IRQ (Bridge %s %04x:%04x)\n",
19   - dev_name(&parent->dev), parent->vendor, parent->device);
20   - dev_printk(KERN_ERR, &pdev->dev, "%s\n", reason);
21   - dev_printk(KERN_ERR, &pdev->dev, "Please report to linux-kernel@vger.kernel.org\n");
  17 + dev_err(&pdev->dev,
  18 + "Potentially misrouted IRQ (Bridge %s %04x:%04x)\n",
  19 + dev_name(&parent->dev), parent->vendor, parent->device);
  20 + dev_err(&pdev->dev, "%s\n", reason);
  21 + dev_err(&pdev->dev, "Please report to linux-kernel@vger.kernel.org\n");
22 22 WARN_ON(1);
23 23 }
24 24  
drivers/pci/pci-stub.c
Diff comments   View file @ 438be3c
... ... @@ -28,7 +28,7 @@
28 28  
29 29 static int pci_stub_probe(struct pci_dev *dev, const struct pci_device_id *id)
30 30 {
31   - dev_printk(KERN_INFO, &dev->dev, "claimed by stub\n");
  31 + dev_info(&dev->dev, "claimed by stub\n");
32 32 return 0;
33 33 }
34 34  
drivers/pci/pcie/aspm.c
Diff comments   View file @ 438be3c
... ... @@ -242,8 +242,7 @@
242 242 return;
243 243  
244 244 /* Training failed. Restore common clock configurations */
245   - dev_printk(KERN_ERR, &parent->dev,
246   - "ASPM: Could not configure common clock\n");
  245 + dev_err(&parent->dev, "ASPM: Could not configure common clock\n");
247 246 list_for_each_entry(child, &linkbus->devices, bus_list)
248 247 pcie_capability_write_word(child, PCI_EXP_LNKCTL,
249 248 child_reg[PCI_FUNC(child->devfn)]);
... ... @@ -507,9 +506,7 @@
507 506 */
508 507 pcie_capability_read_dword(child, PCI_EXP_DEVCAP, &reg32);
509 508 if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) {
510   - dev_printk(KERN_INFO, &child->dev, "disabling ASPM"
511   - " on pre-1.1 PCIe device. You can enable it"
512   - " with 'pcie_aspm=force'\n");
  509 + dev_info(&child->dev, "disabling ASPM on pre-1.1 PCIe device. You can enable it with 'pcie_aspm=force'\n");
513 510 return -EINVAL;
514 511 }
515 512 }