Commit 3d9d8af3 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville

bcma: use custom printing functions

Having bus number printed makes it much easier to anaylze logs on
systems with more buses. For example Netgear WNDR4500 has 3 AMBA buses
in total, which makes standard log really messy.
Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cddec902
...@@ -10,6 +10,15 @@ ...@@ -10,6 +10,15 @@
#define BCMA_CORE_SIZE 0x1000 #define BCMA_CORE_SIZE 0x1000
#define bcma_err(bus, fmt, ...) \
pr_err("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
#define bcma_warn(bus, fmt, ...) \
pr_warn("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
#define bcma_info(bus, fmt, ...) \
pr_info("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
#define bcma_debug(bus, fmt, ...) \
pr_debug("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
struct bcma_bus; struct bcma_bus;
/* main.c */ /* main.c */
......
...@@ -75,7 +75,7 @@ void bcma_core_set_clockmode(struct bcma_device *core, ...@@ -75,7 +75,7 @@ void bcma_core_set_clockmode(struct bcma_device *core,
udelay(10); udelay(10);
} }
if (i) if (i)
pr_err("HT force timeout\n"); bcma_err(core->bus, "HT force timeout\n");
break; break;
case BCMA_CLKMODE_DYNAMIC: case BCMA_CLKMODE_DYNAMIC:
bcma_set32(core, BCMA_CLKCTLST, ~BCMA_CLKCTLST_FORCEHT); bcma_set32(core, BCMA_CLKCTLST, ~BCMA_CLKCTLST_FORCEHT);
...@@ -102,9 +102,9 @@ void bcma_core_pll_ctl(struct bcma_device *core, u32 req, u32 status, bool on) ...@@ -102,9 +102,9 @@ void bcma_core_pll_ctl(struct bcma_device *core, u32 req, u32 status, bool on)
udelay(10); udelay(10);
} }
if (i) if (i)
pr_err("PLL enable timeout\n"); bcma_err(core->bus, "PLL enable timeout\n");
} else { } else {
pr_warn("Disabling PLL not supported yet!\n"); bcma_warn(core->bus, "Disabling PLL not supported yet!\n");
} }
} }
EXPORT_SYMBOL_GPL(bcma_core_pll_ctl); EXPORT_SYMBOL_GPL(bcma_core_pll_ctl);
...@@ -120,8 +120,8 @@ u32 bcma_core_dma_translation(struct bcma_device *core) ...@@ -120,8 +120,8 @@ u32 bcma_core_dma_translation(struct bcma_device *core)
else else
return BCMA_DMA_TRANSLATION_DMA32_CMT; return BCMA_DMA_TRANSLATION_DMA32_CMT;
default: default:
pr_err("DMA translation unknown for host %d\n", bcma_err(core->bus, "DMA translation unknown for host %d\n",
core->bus->hosttype); core->bus->hosttype);
} }
return BCMA_DMA_TRANSLATION_NONE; return BCMA_DMA_TRANSLATION_NONE;
} }
......
...@@ -44,7 +44,7 @@ void bcma_core_chipcommon_init(struct bcma_drv_cc *cc) ...@@ -44,7 +44,7 @@ void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)
if (cc->capabilities & BCMA_CC_CAP_PMU) if (cc->capabilities & BCMA_CC_CAP_PMU)
bcma_pmu_init(cc); bcma_pmu_init(cc);
if (cc->capabilities & BCMA_CC_CAP_PCTL) if (cc->capabilities & BCMA_CC_CAP_PCTL)
pr_err("Power control not implemented!\n"); bcma_err(cc->core->bus, "Power control not implemented!\n");
if (cc->core->id.rev >= 16) { if (cc->core->id.rev >= 16) {
if (cc->core->bus->sprom.leddc_on_time && if (cc->core->bus->sprom.leddc_on_time &&
...@@ -137,8 +137,7 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc) ...@@ -137,8 +137,7 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
| BCMA_CC_CORECTL_UARTCLKEN); | BCMA_CC_CORECTL_UARTCLKEN);
} }
} else { } else {
pr_err("serial not supported on this device ccrev: 0x%x\n", bcma_err(bus, "serial not supported on this device ccrev: 0x%x\n", ccrev);
ccrev);
return; return;
} }
......
...@@ -66,8 +66,8 @@ static void bcma_pmu_resources_init(struct bcma_drv_cc *cc) ...@@ -66,8 +66,8 @@ static void bcma_pmu_resources_init(struct bcma_drv_cc *cc)
max_msk = 0xFFFF; max_msk = 0xFFFF;
break; break;
default: default:
pr_debug("PMU resource config unknown or not needed for device 0x%04X\n", bcma_debug(bus, "PMU resource config unknown or not needed for device 0x%04X\n",
bus->chipinfo.id); bus->chipinfo.id);
} }
/* Set the resource masks. */ /* Set the resource masks. */
...@@ -136,8 +136,8 @@ void bcma_pmu_workarounds(struct bcma_drv_cc *cc) ...@@ -136,8 +136,8 @@ void bcma_pmu_workarounds(struct bcma_drv_cc *cc)
} }
break; break;
default: default:
pr_debug("Workarounds unknown or not needed for device 0x%04X\n", bcma_debug(bus, "Workarounds unknown or not needed for device 0x%04X\n",
bus->chipinfo.id); bus->chipinfo.id);
} }
} }
...@@ -148,8 +148,8 @@ void bcma_pmu_init(struct bcma_drv_cc *cc) ...@@ -148,8 +148,8 @@ void bcma_pmu_init(struct bcma_drv_cc *cc)
pmucap = bcma_cc_read32(cc, BCMA_CC_PMU_CAP); pmucap = bcma_cc_read32(cc, BCMA_CC_PMU_CAP);
cc->pmu.rev = (pmucap & BCMA_CC_PMU_CAP_REVISION); cc->pmu.rev = (pmucap & BCMA_CC_PMU_CAP_REVISION);
pr_debug("Found rev %u PMU (capabilities 0x%08X)\n", cc->pmu.rev, bcma_debug(cc->core->bus, "Found rev %u PMU (capabilities 0x%08X)\n",
pmucap); cc->pmu.rev, pmucap);
if (cc->pmu.rev == 1) if (cc->pmu.rev == 1)
bcma_cc_mask32(cc, BCMA_CC_PMU_CTL, bcma_cc_mask32(cc, BCMA_CC_PMU_CTL,
...@@ -181,9 +181,8 @@ u32 bcma_pmu_alp_clock(struct bcma_drv_cc *cc) ...@@ -181,9 +181,8 @@ u32 bcma_pmu_alp_clock(struct bcma_drv_cc *cc)
/* always 25Mhz */ /* always 25Mhz */
return 25000 * 1000; return 25000 * 1000;
default: default:
pr_warn("No ALP clock specified for %04X device, " bcma_warn(bus, "No ALP clock specified for %04X device, pmu rev. %d, using default %d Hz\n",
"pmu rev. %d, using default %d Hz\n", bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_ALP_CLOCK);
bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_ALP_CLOCK);
} }
return BCMA_CC_PMU_ALP_CLOCK; return BCMA_CC_PMU_ALP_CLOCK;
} }
...@@ -251,9 +250,8 @@ u32 bcma_pmu_get_clockcontrol(struct bcma_drv_cc *cc) ...@@ -251,9 +250,8 @@ u32 bcma_pmu_get_clockcontrol(struct bcma_drv_cc *cc)
case BCMA_CHIP_ID_BCM53572: case BCMA_CHIP_ID_BCM53572:
return 75000000; return 75000000;
default: default:
pr_warn("No backplane clock specified for %04X device, " bcma_warn(bus, "No backplane clock specified for %04X device, pmu rev. %d, using default %d Hz\n",
"pmu rev. %d, using default %d Hz\n", bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_HT_CLOCK);
bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_HT_CLOCK);
} }
return BCMA_CC_PMU_HT_CLOCK; return BCMA_CC_PMU_HT_CLOCK;
} }
...@@ -459,8 +457,8 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid) ...@@ -459,8 +457,8 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid)
tmp = 1 << 10; tmp = 1 << 10;
break; break;
default: default:
pr_err("unknown spuravoidance settings for chip 0x%04X, not changing PLL\n", bcma_err(bus, "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n",
bus->chipinfo.id); bus->chipinfo.id);
break; break;
} }
......
...@@ -143,8 +143,8 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq) ...@@ -143,8 +143,8 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq)
1 << irqflag); 1 << irqflag);
} }
pr_info("set_irq: core 0x%04x, irq %d => %d\n", bcma_info(bus, "set_irq: core 0x%04x, irq %d => %d\n",
dev->id.id, oldirq + 2, irq + 2); dev->id.id, oldirq + 2, irq + 2);
} }
static void bcma_core_mips_print_irq(struct bcma_device *dev, unsigned int irq) static void bcma_core_mips_print_irq(struct bcma_device *dev, unsigned int irq)
...@@ -173,7 +173,7 @@ u32 bcma_cpu_clock(struct bcma_drv_mips *mcore) ...@@ -173,7 +173,7 @@ u32 bcma_cpu_clock(struct bcma_drv_mips *mcore)
if (bus->drv_cc.capabilities & BCMA_CC_CAP_PMU) if (bus->drv_cc.capabilities & BCMA_CC_CAP_PMU)
return bcma_pmu_get_clockcpu(&bus->drv_cc); return bcma_pmu_get_clockcpu(&bus->drv_cc);
pr_err("No PMU available, need this to get the cpu clock\n"); bcma_err(bus, "No PMU available, need this to get the cpu clock\n");
return 0; return 0;
} }
EXPORT_SYMBOL(bcma_cpu_clock); EXPORT_SYMBOL(bcma_cpu_clock);
...@@ -185,10 +185,10 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore) ...@@ -185,10 +185,10 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)
switch (bus->drv_cc.capabilities & BCMA_CC_CAP_FLASHT) { switch (bus->drv_cc.capabilities & BCMA_CC_CAP_FLASHT) {
case BCMA_CC_FLASHT_STSER: case BCMA_CC_FLASHT_STSER:
case BCMA_CC_FLASHT_ATSER: case BCMA_CC_FLASHT_ATSER:
pr_err("Serial flash not supported.\n"); bcma_err(bus, "Serial flash not supported.\n");
break; break;
case BCMA_CC_FLASHT_PARA: case BCMA_CC_FLASHT_PARA:
pr_info("found parallel flash.\n"); bcma_info(bus, "found parallel flash.\n");
bus->drv_cc.pflash.window = 0x1c000000; bus->drv_cc.pflash.window = 0x1c000000;
bus->drv_cc.pflash.window_size = 0x02000000; bus->drv_cc.pflash.window_size = 0x02000000;
...@@ -199,7 +199,7 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore) ...@@ -199,7 +199,7 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)
bus->drv_cc.pflash.buswidth = 2; bus->drv_cc.pflash.buswidth = 2;
break; break;
default: default:
pr_err("flash not supported.\n"); bcma_err(bus, "flash not supported.\n");
} }
} }
...@@ -209,7 +209,7 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore) ...@@ -209,7 +209,7 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore)
struct bcma_device *core; struct bcma_device *core;
bus = mcore->core->bus; bus = mcore->core->bus;
pr_info("Initializing MIPS core...\n"); bcma_info(bus, "Initializing MIPS core...\n");
if (!mcore->setup_done) if (!mcore->setup_done)
mcore->assigned_irqs = 1; mcore->assigned_irqs = 1;
...@@ -244,7 +244,7 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore) ...@@ -244,7 +244,7 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore)
break; break;
} }
} }
pr_info("IRQ reconfiguration done\n"); bcma_info(bus, "IRQ reconfiguration done\n");
bcma_core_mips_dump_irq(bus); bcma_core_mips_dump_irq(bus);
if (mcore->setup_done) if (mcore->setup_done)
......
...@@ -36,7 +36,7 @@ bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc) ...@@ -36,7 +36,7 @@ bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc)
return false; return false;
if (bus->sprom.boardflags_lo & BCMA_CORE_PCI_BFL_NOPCI) { if (bus->sprom.boardflags_lo & BCMA_CORE_PCI_BFL_NOPCI) {
pr_info("This PCI core is disabled and not working\n"); bcma_info(bus, "This PCI core is disabled and not working\n");
return false; return false;
} }
...@@ -341,6 +341,7 @@ static u8 __devinit bcma_find_pci_capability(struct bcma_drv_pci *pc, ...@@ -341,6 +341,7 @@ static u8 __devinit bcma_find_pci_capability(struct bcma_drv_pci *pc,
*/ */
static void __devinit bcma_core_pci_enable_crs(struct bcma_drv_pci *pc) static void __devinit bcma_core_pci_enable_crs(struct bcma_drv_pci *pc)
{ {
struct bcma_bus *bus = pc->core->bus;
u8 cap_ptr, root_ctrl, root_cap, dev; u8 cap_ptr, root_ctrl, root_cap, dev;
u16 val16; u16 val16;
int i; int i;
...@@ -379,7 +380,8 @@ static void __devinit bcma_core_pci_enable_crs(struct bcma_drv_pci *pc) ...@@ -379,7 +380,8 @@ static void __devinit bcma_core_pci_enable_crs(struct bcma_drv_pci *pc)
udelay(10); udelay(10);
} }
if (val16 == 0x1) if (val16 == 0x1)
pr_err("PCI: Broken device in slot %d\n", dev); bcma_err(bus, "PCI: Broken device in slot %d\n",
dev);
} }
} }
} }
...@@ -392,11 +394,11 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc) ...@@ -392,11 +394,11 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
u32 pci_membase_1G; u32 pci_membase_1G;
unsigned long io_map_base; unsigned long io_map_base;
pr_info("PCIEcore in host mode found\n"); bcma_info(bus, "PCIEcore in host mode found\n");
pc_host = kzalloc(sizeof(*pc_host), GFP_KERNEL); pc_host = kzalloc(sizeof(*pc_host), GFP_KERNEL);
if (!pc_host) { if (!pc_host) {
pr_err("can not allocate memory"); bcma_err(bus, "can not allocate memory");
return; return;
} }
......
...@@ -18,7 +18,7 @@ static void bcma_host_pci_switch_core(struct bcma_device *core) ...@@ -18,7 +18,7 @@ static void bcma_host_pci_switch_core(struct bcma_device *core)
pci_write_config_dword(core->bus->host_pci, BCMA_PCI_BAR0_WIN2, pci_write_config_dword(core->bus->host_pci, BCMA_PCI_BAR0_WIN2,
core->wrap); core->wrap);
core->bus->mapped_core = core; core->bus->mapped_core = core;
pr_debug("Switched to core: 0x%X\n", core->id.id); bcma_debug(core->bus, "Switched to core: 0x%X\n", core->id.id);
} }
/* Provides access to the requested core. Returns base offset that has to be /* Provides access to the requested core. Returns base offset that has to be
...@@ -188,7 +188,7 @@ static int __devinit bcma_host_pci_probe(struct pci_dev *dev, ...@@ -188,7 +188,7 @@ static int __devinit bcma_host_pci_probe(struct pci_dev *dev,
/* SSB needed additional powering up, do we have any AMBA PCI cards? */ /* SSB needed additional powering up, do we have any AMBA PCI cards? */
if (!pci_is_pcie(dev)) if (!pci_is_pcie(dev))
pr_err("PCI card detected, report problems.\n"); bcma_err(bus, "PCI card detected, report problems.\n");
/* Map MMIO */ /* Map MMIO */
err = -ENOMEM; err = -ENOMEM;
......
...@@ -118,8 +118,9 @@ static int bcma_register_cores(struct bcma_bus *bus) ...@@ -118,8 +118,9 @@ static int bcma_register_cores(struct bcma_bus *bus)
err = device_register(&core->dev); err = device_register(&core->dev);
if (err) { if (err) {
pr_err("Could not register dev for core 0x%03X\n", bcma_err(bus,
core->id.id); "Could not register dev for core 0x%03X\n",
core->id.id);
continue; continue;
} }
core->dev_registered = true; core->dev_registered = true;
...@@ -151,7 +152,7 @@ int __devinit bcma_bus_register(struct bcma_bus *bus) ...@@ -151,7 +152,7 @@ int __devinit bcma_bus_register(struct bcma_bus *bus)
/* Scan for devices (cores) */ /* Scan for devices (cores) */
err = bcma_bus_scan(bus); err = bcma_bus_scan(bus);
if (err) { if (err) {
pr_err("Failed to scan: %d\n", err); bcma_err(bus, "Failed to scan: %d\n", err);
return -1; return -1;
} }
...@@ -179,14 +180,14 @@ int __devinit bcma_bus_register(struct bcma_bus *bus) ...@@ -179,14 +180,14 @@ int __devinit bcma_bus_register(struct bcma_bus *bus)
/* Try to get SPROM */ /* Try to get SPROM */
err = bcma_sprom_get(bus); err = bcma_sprom_get(bus);
if (err == -ENOENT) { if (err == -ENOENT) {
pr_err("No SPROM available\n"); bcma_err(bus, "No SPROM available\n");
} else if (err) } else if (err)
pr_err("Failed to get SPROM: %d\n", err); bcma_err(bus, "Failed to get SPROM: %d\n", err);
/* Register found cores */ /* Register found cores */
bcma_register_cores(bus); bcma_register_cores(bus);
pr_info("Bus registered\n"); bcma_info(bus, "Bus registered\n");
return 0; return 0;
} }
...@@ -214,7 +215,7 @@ int __init bcma_bus_early_register(struct bcma_bus *bus, ...@@ -214,7 +215,7 @@ int __init bcma_bus_early_register(struct bcma_bus *bus,
/* Scan for chip common core */ /* Scan for chip common core */
err = bcma_bus_scan_early(bus, &match, core_cc); err = bcma_bus_scan_early(bus, &match, core_cc);
if (err) { if (err) {
pr_err("Failed to scan for common core: %d\n", err); bcma_err(bus, "Failed to scan for common core: %d\n", err);
return -1; return -1;
} }
...@@ -226,7 +227,7 @@ int __init bcma_bus_early_register(struct bcma_bus *bus, ...@@ -226,7 +227,7 @@ int __init bcma_bus_early_register(struct bcma_bus *bus,
/* Scan for mips core */ /* Scan for mips core */
err = bcma_bus_scan_early(bus, &match, core_mips); err = bcma_bus_scan_early(bus, &match, core_mips);
if (err) { if (err) {
pr_err("Failed to scan for mips core: %d\n", err); bcma_err(bus, "Failed to scan for mips core: %d\n", err);
return -1; return -1;
} }
...@@ -244,7 +245,7 @@ int __init bcma_bus_early_register(struct bcma_bus *bus, ...@@ -244,7 +245,7 @@ int __init bcma_bus_early_register(struct bcma_bus *bus,
bcma_core_mips_init(&bus->drv_mips); bcma_core_mips_init(&bus->drv_mips);
} }
pr_info("Early bus registered\n"); bcma_info(bus, "Early bus registered\n");
return 0; return 0;
} }
......
...@@ -340,7 +340,7 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr, ...@@ -340,7 +340,7 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
if (tmp <= 0) { if (tmp <= 0) {
return -EILSEQ; return -EILSEQ;
} else { } else {
pr_info("Bridge found\n"); bcma_info(bus, "Bridge found\n");
return -ENXIO; return -ENXIO;
} }
} }
...@@ -427,8 +427,8 @@ void bcma_init_bus(struct bcma_bus *bus) ...@@ -427,8 +427,8 @@ void bcma_init_bus(struct bcma_bus *bus)
chipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT; chipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
chipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT; chipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT; chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
pr_info("Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n", bcma_info(bus, "Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
chipinfo->id, chipinfo->rev, chipinfo->pkg); chipinfo->id, chipinfo->rev, chipinfo->pkg);
bus->init_done = true; bus->init_done = true;
} }
...@@ -482,11 +482,10 @@ int bcma_bus_scan(struct bcma_bus *bus) ...@@ -482,11 +482,10 @@ int bcma_bus_scan(struct bcma_bus *bus)
other_core = bcma_find_core_reverse(bus, core->id.id); other_core = bcma_find_core_reverse(bus, core->id.id);
core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1; core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1;
pr_info("Core %d found: %s " bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
"(manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n", core->core_index, bcma_device_name(&core->id),
core->core_index, bcma_device_name(&core->id), core->id.manuf, core->id.id, core->id.rev,
core->id.manuf, core->id.id, core->id.rev, core->id.class);
core->id.class);
list_add(&core->list, &bus->cores); list_add(&core->list, &bus->cores);
} }
...@@ -538,11 +537,10 @@ int __init bcma_bus_scan_early(struct bcma_bus *bus, ...@@ -538,11 +537,10 @@ int __init bcma_bus_scan_early(struct bcma_bus *bus,
core->core_index = core_num++; core->core_index = core_num++;
bus->nr_cores++; bus->nr_cores++;
pr_info("Core %d found: %s " bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
"(manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n", core->core_index, bcma_device_name(&core->id),
core->core_index, bcma_device_name(&core->id), core->id.manuf, core->id.id, core->id.rev,
core->id.manuf, core->id.id, core->id.rev, core->id.class);
core->id.class);
list_add(&core->list, &bus->cores); list_add(&core->list, &bus->cores);
err = 0; err = 0;
......
...@@ -60,11 +60,11 @@ static int bcma_fill_sprom_with_fallback(struct bcma_bus *bus, ...@@ -60,11 +60,11 @@ static int bcma_fill_sprom_with_fallback(struct bcma_bus *bus,
if (err) if (err)
goto fail; goto fail;
pr_debug("Using SPROM revision %d provided by" bcma_debug(bus, "Using SPROM revision %d provided by platform.\n",
" platform.\n", bus->sprom.revision); bus->sprom.revision);
return 0; return 0;
fail: fail:
pr_warn("Using fallback SPROM failed (err %d)\n", err); bcma_warn(bus, "Using fallback SPROM failed (err %d)\n", err);
return err; return err;
} }
...@@ -583,7 +583,7 @@ int bcma_sprom_get(struct bcma_bus *bus) ...@@ -583,7 +583,7 @@ int bcma_sprom_get(struct bcma_bus *bus)
bus->chipinfo.id == BCMA_CHIP_ID_BCM43431) bus->chipinfo.id == BCMA_CHIP_ID_BCM43431)
bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, false); bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, false);
pr_debug("SPROM offset 0x%x\n", offset); bcma_debug(bus, "SPROM offset 0x%x\n", offset);
bcma_sprom_read(bus, offset, sprom); bcma_sprom_read(bus, offset, sprom);
if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4331 || if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4331 ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment