aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/early-quirks.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index bae0d32e327b..da5d8ac60062 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -28,8 +28,6 @@
28#include <asm/irq_remapping.h> 28#include <asm/irq_remapping.h>
29#include <asm/early_ioremap.h> 29#include <asm/early_ioremap.h>
30 30
31#define dev_err(msg) pr_err("pci 0000:%02x:%02x.%d: %s", bus, slot, func, msg)
32
33static void __init fix_hypertransport_config(int num, int slot, int func) 31static void __init fix_hypertransport_config(int num, int slot, int func)
34{ 32{
35 u32 htcfg; 33 u32 htcfg;
@@ -617,7 +615,8 @@ static void __init apple_airport_reset(int bus, int slot, int func)
617 615
618 pmcsr = read_pci_config_16(bus, slot, func, BCM4331_PM_CAP + PCI_PM_CTRL); 616 pmcsr = read_pci_config_16(bus, slot, func, BCM4331_PM_CAP + PCI_PM_CTRL);
619 if ((pmcsr & PCI_PM_CTRL_STATE_MASK) != PCI_D0) { 617 if ((pmcsr & PCI_PM_CTRL_STATE_MASK) != PCI_D0) {
620 dev_err("Cannot power up Apple AirPort card\n"); 618 pr_err("pci 0000:%02x:%02x.%d: Cannot power up Apple AirPort card\n",
619 bus, slot, func);
621 return; 620 return;
622 } 621 }
623 } 622 }
@@ -628,7 +627,8 @@ static void __init apple_airport_reset(int bus, int slot, int func)
628 627
629 mmio = early_ioremap(addr, BCM4331_MMIO_SIZE); 628 mmio = early_ioremap(addr, BCM4331_MMIO_SIZE);
630 if (!mmio) { 629 if (!mmio) {
631 dev_err("Cannot iomap Apple AirPort card\n"); 630 pr_err("pci 0000:%02x:%02x.%d: Cannot iomap Apple AirPort card\n",
631 bus, slot, func);
632 return; 632 return;
633 } 633 }
634 634