aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bcma/scan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/bcma/scan.c')
-rw-r--r--drivers/bcma/scan.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index a3420585d942..a0272bbfc4f6 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -340,7 +340,7 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
340 if (tmp <= 0) { 340 if (tmp <= 0) {
341 return -EILSEQ; 341 return -EILSEQ;
342 } else { 342 } else {
343 pr_info("Bridge found\n"); 343 bcma_info(bus, "Bridge found\n");
344 return -ENXIO; 344 return -ENXIO;
345 } 345 }
346 } 346 }
@@ -427,8 +427,8 @@ void bcma_init_bus(struct bcma_bus *bus)
427 chipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT; 427 chipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
428 chipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT; 428 chipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
429 chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT; 429 chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
430 pr_info("Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n", 430 bcma_info(bus, "Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
431 chipinfo->id, chipinfo->rev, chipinfo->pkg); 431 chipinfo->id, chipinfo->rev, chipinfo->pkg);
432 432
433 bus->init_done = true; 433 bus->init_done = true;
434} 434}
@@ -482,11 +482,10 @@ int bcma_bus_scan(struct bcma_bus *bus)
482 other_core = bcma_find_core_reverse(bus, core->id.id); 482 other_core = bcma_find_core_reverse(bus, core->id.id);
483 core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1; 483 core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1;
484 484
485 pr_info("Core %d found: %s " 485 bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
486 "(manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n", 486 core->core_index, bcma_device_name(&core->id),
487 core->core_index, bcma_device_name(&core->id), 487 core->id.manuf, core->id.id, core->id.rev,
488 core->id.manuf, core->id.id, core->id.rev, 488 core->id.class);
489 core->id.class);
490 489
491 list_add(&core->list, &bus->cores); 490 list_add(&core->list, &bus->cores);
492 } 491 }
@@ -538,11 +537,10 @@ int __init bcma_bus_scan_early(struct bcma_bus *bus,
538 537
539 core->core_index = core_num++; 538 core->core_index = core_num++;
540 bus->nr_cores++; 539 bus->nr_cores++;
541 pr_info("Core %d found: %s " 540 bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
542 "(manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n", 541 core->core_index, bcma_device_name(&core->id),
543 core->core_index, bcma_device_name(&core->id), 542 core->id.manuf, core->id.id, core->id.rev,
544 core->id.manuf, core->id.id, core->id.rev, 543 core->id.class);
545 core->id.class);
546 544
547 list_add(&core->list, &bus->cores); 545 list_add(&core->list, &bus->cores);
548 err = 0; 546 err = 0;