Merge tag 'drm-intel-next-2018-07-19' of git://anongit.freedesktop.org/drm/drm-intel...

[platform/kernel/linux-rpi.git] / arch / x86 / kernel / early-quirks.c

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 72c2cf9..50d5848 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;
@@ -635,7 +633,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;
                }
        }
@@ -646,7 +645,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;
        }