Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Joe Perches and committed by
Bjorn Helgaas
438be3c6 1f09b09b

+8 -11
+5 -5
drivers/pci/irq.c
··· 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
+1 -1
drivers/pci/pci-stub.c
··· 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
+2 -5
drivers/pci/pcie/aspm.c
··· 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)]); ··· 506 507 */ 507 508 pcie_capability_read_dword(child, PCI_EXP_DEVCAP, &reg32); 508 509 if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) { 509 - dev_printk(KERN_INFO, &child->dev, "disabling ASPM" 510 - " on pre-1.1 PCIe device. You can enable it" 511 - " with 'pcie_aspm=force'\n"); 510 + dev_info(&child->dev, "disabling ASPM on pre-1.1 PCIe device. You can enable it with 'pcie_aspm=force'\n"); 512 511 return -EINVAL; 513 512 } 514 513 }