bcma: print chip ID in a more user-friendly form

Some chip IDs are easier to read/understand when printed in a decimal
form. For example on my bcm53xx arch router this patch replaces:
Found chip with id 0xCF12, rev 0x00 and package 0x02
with a:
Found chip with id 53010, rev 0x00 and package 0x02

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index b3a403c136fb4477722b2889284691f04064a825..14b56561a36f10713cc5c470b838b25da4687999 100644 (file)
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -439,6 +439,7 @@ void bcma_init_bus(struct bcma_bus *bus)
 {
        s32 tmp;
        struct bcma_chipinfo *chipinfo = &(bus->chipinfo);
+       char chip_id[8];
 
        INIT_LIST_HEAD(&bus->cores);
        bus->nr_cores = 0;
@@ -449,8 +450,11 @@ void bcma_init_bus(struct bcma_bus *bus)
        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->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
-       bcma_info(bus, "Found chip with id 0x%04X, rev 0x%02X and package 0x%02X\n",
-                 chipinfo->id, chipinfo->rev, chipinfo->pkg);
+
+       snprintf(chip_id, ARRAY_SIZE(chip_id),
+                (chipinfo->id > 0x9999) ? "%d" : "0x%04X", chipinfo->id);
+       bcma_info(bus, "Found chip with id %s, rev 0x%02X and package 0x%02X\n",
+                 chip_id, chipinfo->rev, chipinfo->pkg);
 }
 
 int bcma_bus_scan(struct bcma_bus *bus)