On Sun, Oct 28, 2012 at 2:05 AM, Joe Perches <joe@xxxxxxxxxxx> wrote:
> 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@xxxxxxxxxxx>
I applied this to my pci/misc branch as v3.8 material. Thanks!
> ---
> drivers/pci/irq.c | 10 +++++-----
> drivers/pci/pci-stub.c | 2 +-
> drivers/pci/pcie/aspm.c | 7 ++-----
> 3 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/pci/irq.c b/drivers/pci/irq.c
> index e5f69a4..b008cf8 100644
> --- a/drivers/pci/irq.c
> +++ b/drivers/pci/irq.c
> @@ -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,
> - "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@xxxxxxxxxxxxxxx\n");
> + dev_err(&pdev->dev,
> + "Potentially misrouted IRQ (Bridge %s %04x:%04x)\n",
> + dev_name(&parent->dev), parent->vendor, parent->device);
> + dev_err(&pdev->dev, "%s\n", reason);
> + dev_err(&pdev->dev, "Please report to linux-kernel@xxxxxxxxxxxxxxx\n");
> WARN_ON(1);
> }
>
> diff --git a/drivers/pci/pci-stub.c b/drivers/pci/pci-stub.c
> index 775e933..6e47c51 100644
> --- a/drivers/pci/pci-stub.c
> +++ b/drivers/pci/pci-stub.c
> @@ -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;
> }
>
> diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
> index 213753b..3da9ecc 100644
> --- a/drivers/pci/pcie/aspm.c
> +++ b/drivers/pci/pcie/aspm.c
> @@ -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, ®32);
> 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;
> }
> }
> --
> 1.7.8.112.g3fd21
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
