ACPI: PCI: IRQ: Consolidate printing diagnostic messages

The code in pci_irq.c prints diagnostic messages using different
and inconsistent methods.  The majority of them are printed with
the help of the dev_*() familiy of logging functions, but
ACPI_DEBUG_PRINT() and ACPI_DEBUG_PRINT_RAW() are still used in
some places which requires the ACPICA debug to be enabled
additionally which is a nuisance and one message is printed
using the raw printk().

To consolidate the printing of messages in that code, convert all of
the ACPI_DEBUG_PRINT() instances in it into dev_dbg(), which is
consistent with the way the other messages are printed by it,
replace the only ACPI_DEBUG_PRINT_RAW() instance with pr_debug() and
make it use pr_warn() istead of printk(KERN_WARNING ).

Also add a pr_fmt() definition to that file and drop the
_COMPONENT and ACPI_MODULE_NAME() definitions that are not used
any more after the above changes.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 14ee631..08e1577 100644 (file)
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -9,6 +9,7 @@
  *     Bjorn Helgaas <bjorn.helgaas@hp.com>
  */
 
+#define pr_fmt(fmt) "ACPI: PCI: " fmt
 
 #include <linux/dmi.h>
 #include <linux/kernel.h>
@@ -22,11 +23,6 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 
-#define PREFIX "ACPI: "
-
-#define _COMPONENT             ACPI_PCI_COMPONENT
-ACPI_MODULE_NAME("pci_irq");
-
 struct acpi_prt_entry {
        struct acpi_pci_id      id;
        u8                      pin;
@@ -126,7 +122,7 @@ static void do_prt_fixups(struct acpi_prt_entry *entry,
                    entry->pin == quirk->pin &&
                    !strcmp(prt->source, quirk->source) &&
                    strlen(prt->source) >= strlen(quirk->actual_source)) {
-                       printk(KERN_WARNING PREFIX "firmware reports "
+                       pr_warn("Firmware reports "
                                "%04x:%02x:%02x PCI INT %c connected to %s; "
                                "changing to %s\n",
                                entry->id.segment, entry->id.bus,
@@ -191,12 +187,9 @@ static int acpi_pci_irq_check_entry(acpi_handle handle, struct pci_dev *dev,
         * the IRQ value, which is hardwired to specific interrupt inputs on
         * the interrupt controller.
         */
-
-       ACPI_DEBUG_PRINT_RAW((ACPI_DB_INFO,
-                             "      %04x:%02x:%02x[%c] -> %s[%d]\n",
-                             entry->id.segment, entry->id.bus,
-                             entry->id.device, pin_name(entry->pin),
-                             prt->source, entry->index));
+       pr_debug("%04x:%02x:%02x[%c] -> %s[%d]\n",
+                entry->id.segment, entry->id.bus, entry->id.device,
+                pin_name(entry->pin), prt->source, entry->index);
 
        *entry_ptr = entry;
 
@@ -307,8 +300,7 @@ static struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin)
 #ifdef CONFIG_X86_IO_APIC
                acpi_reroute_boot_interrupt(dev, entry);
 #endif /* CONFIG_X86_IO_APIC */
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found %s[%c] _PRT entry\n",
-                                 pci_name(dev), pin_name(pin)));
+               dev_dbg(&dev->dev, "Found [%c] _PRT entry\n", pin_name(pin));
                return entry;
        }
 
@@ -324,9 +316,7 @@ static struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin)
                        /* PC card has the same IRQ as its cardbridge */
                        bridge_pin = bridge->pin;
                        if (!bridge_pin) {
-                               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                                 "No interrupt pin configured for device %s\n",
-                                                 pci_name(bridge)));
+                               dev_dbg(&bridge->dev, "No interrupt pin configured\n");
                                return NULL;
                        }
                        pin = bridge_pin;
@@ -334,10 +324,8 @@ static struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin)
 
                ret = acpi_pci_irq_find_prt_entry(bridge, pin, &entry);
                if (!ret && entry) {
-                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                        "Derived GSI for %s INT %c from %s\n",
-                                        pci_name(dev), pin_name(orig_pin),
-                                        pci_name(bridge)));
+                       dev_dbg(&dev->dev, "Derived GSI INT %c from %s\n",
+                               pin_name(orig_pin), pci_name(bridge));
                        return entry;
                }
 
@@ -413,9 +401,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
 
        pin = dev->pin;
        if (!pin) {
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                 "No interrupt pin configured for device %s\n",
-                                 pci_name(dev)));
+               dev_dbg(&dev->dev, "No interrupt pin configured\n");
                return 0;
        }