x86/early-quirks: Rename duplicate define of dev_err

dev_err is becoming a macro calling _dev_err to allow prefixing of
dev_fmt to any dev_<level> use that has a #define dev_fmt(fmt) similar
to the existing #define pr_fmt(fmt) uses.

Remove this dev_err macro and convert the existing two uses to pr_err.
This allows clean compilation in the patch that introduces dev_fmt which
can prefix dev_<level> logging macros with arbitrary content similar to
the #define pr_fmt macro.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Link: https://lkml.kernel.org/r/8fb4b2a77d50e21ae1f7e4e267e68691efe2c270.1525878372.git.joe@perches.com

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index bae0d32..da5d8ac 100644 (file)
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -28,8 +28,6 @@
 #include <asm/irq_remapping.h>
 #include <asm/early_ioremap.h>
 
-#define dev_err(msg)  pr_err("pci 0000:%02x:%02x.%d: %s", bus, slot, func, msg)
-
 static void __init fix_hypertransport_config(int num, int slot, int func)
 {
        u32 htcfg;
@@ -617,7 +615,8 @@ static void __init apple_airport_reset(int bus, int slot, int func)
 
                pmcsr = read_pci_config_16(bus, slot, func, BCM4331_PM_CAP + PCI_PM_CTRL);
                if ((pmcsr & PCI_PM_CTRL_STATE_MASK) != PCI_D0) {
-                       dev_err("Cannot power up Apple AirPort card\n");
+                       pr_err("pci 0000:%02x:%02x.%d: Cannot power up Apple AirPort card\n",
+                              bus, slot, func);
                        return;
                }
        }
@@ -628,7 +627,8 @@ static void __init apple_airport_reset(int bus, int slot, int func)
 
        mmio = early_ioremap(addr, BCM4331_MMIO_SIZE);
        if (!mmio) {
-               dev_err("Cannot iomap Apple AirPort card\n");
+               pr_err("pci 0000:%02x:%02x.%d: Cannot iomap Apple AirPort card\n",
+                      bus, slot, func);
                return;
        }