Message ID | alpine.LNX.2.00.1204161335420.16373@pobox.suse.cz |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Mon, Apr 16, 2012 at 02:02:48PM +0200, Jiri Kosina wrote: > I propose the minimalistic fix instead ... it'd be better to just drop the > BUGMSG() thing altogether and convert it to dev_printk(), but that'd be > larger revamp of the driver, and such effort is questionable for something > like Arcnet :) You're right, I'm not really interested in spending any amount of time on ARCnet. It's just something I noticed when I was booting a poorly-configured kernel and thought I'd try a drive-by fix. :) Thanks for your time, Steve. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jiri Kosina <jkosina@suse.cz> Date: Mon, 16 Apr 2012 14:02:48 +0200 (CEST) > From: Jiri Kosina <jkosina@suse.cz> > Subject: [PATCH] arcnet: rimi: Fix device name in debug output > > arcrimi_probe() calls BUGMSG() before register_netdev() happens. BUGMSG() > itself prints dev->name, but as the format string hasn't been expanded by > register_netdev() yet, the output contains bogus device name such as > > arc%d: Given: node 00h, shmem 0h, irq 0 > > As we don't know the device name yet, just drop the prefix completely from > the debugging messages. > > Reported-by: Steven Young <sdyoung@vt220.org> > Signed-off-by: Jiri Kosina <jkosina@suse.cz> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c index 25197b6..b8b4c7b 100644 --- a/drivers/net/arcnet/arc-rimi.c +++ b/drivers/net/arcnet/arc-rimi.c @@ -89,16 +89,16 @@ static int __init arcrimi_probe(struct net_device *dev) BUGLVL(D_NORMAL) printk(VERSION); BUGLVL(D_NORMAL) printk("E-mail me if you actually test the RIM I driver, please!\n"); - BUGMSG(D_NORMAL, "Given: node %02Xh, shmem %lXh, irq %d\n", + BUGLVL(D_NORMAL) printk("Given: node %02Xh, shmem %lXh, irq %d\n", dev->dev_addr[0], dev->mem_start, dev->irq); if (dev->mem_start <= 0 || dev->irq <= 0) { - BUGMSG(D_NORMAL, "No autoprobe for RIM I; you " + BUGLVL(D_NORMAL) printk("No autoprobe for RIM I; you " "must specify the shmem and irq!\n"); return -ENODEV; } if (dev->dev_addr[0] == 0) { - BUGMSG(D_NORMAL, "You need to specify your card's station " + BUGLVL(D_NORMAL) printk("You need to specify your card's station " "ID!\n"); return -ENODEV; } @@ -109,7 +109,7 @@ static int __init arcrimi_probe(struct net_device *dev) * will be taken. */ if (!request_mem_region(dev->mem_start, MIRROR_SIZE, "arcnet (90xx)")) { - BUGMSG(D_NORMAL, "Card memory already allocated\n"); + BUGLVL(D_NORMAL) printk("Card memory already allocated\n"); return -ENODEV; } return arcrimi_found(dev);