Some of the newer Broadcom chipsets have longe names like BCM43224, BCM43225, etc. However Broadcom decided to keep using u16 for storing them. Use %X or %d depending on chip_id value to avoid BCMA8D8, etc. --- Is there any nicer way of doing that? Currently I have whole string duplicated. Can we define part of the format using condition? Like (chip_id > 0x9999) ? "%d" : "%04X" ? --- drivers/net/wireless/b43/main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 22f20e1..549555e 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -5202,7 +5202,9 @@ static struct b43_wl *b43_wireless_init(struct b43_bus_dev *dev) INIT_WORK(&wl->tx_work, b43_tx_work); skb_queue_head_init(&wl->tx_queue); - b43info(wl, "Broadcom %04X WLAN found (core revision %u)\n", + b43info(wl, (dev->chip_id > 0x9999) ? + "Broadcom %d WLAN found (core revision %u)\n" : + "Broadcom %04X WLAN found (core revision %u)\n", dev->chip_id, dev->core_rev); return wl; } -- 1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
