From: Meelis Roos <mroos@linux.ee>
To: netdev@vger.kernel.org
Subject: [PATCH] ibmtr: fix tr%d in dmesg
Date: Sat, 2 Oct 2010 21:35:15 +0300 (EEST) [thread overview]
Message-ID: <alpine.SOC.1.00.1010022056000.27121@math.ut.ee> (raw)
ibmtr and ibmtr_cs show tr%d in dmesg after alloc_netdev() but before
register_netdev(). Fix it like e100 does - put a different name into
dev->name until the device gets registered. I/O port seems to be unique
enough and is available for the time of printk messages. With the fix,
dmesg shows
ibmtr@0a20: ISA P&P 16/4 Adapter/A (short) | 16/4 ISA-16 Adapter found
ibmtr@0a20: using irq 3, PIOaddr a20, 64K shared RAM.
ibmtr@0a20: Hardware address : 00:40:aa:a9:03:98
ibmtr@0a20: Shared RAM paging disabled. ti->page_mask 0
ibmtr@0a20: Maximum Receive Internet Protocol MTU 16Mbps: 16344, 4Mbps: 6104
tr0: port 0xa20, irq 3, mmio 0xd4850000, sram 0xd0000, hwaddr=00:40:aa:a9:03:98
Signed-off-by: Meelis Roos <mroos@linux.ee>
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 91e6c78..5de281f 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -368,6 +368,7 @@ int __devinit ibmtr_probe_card(struct net_device *dev)
{
int err = ibmtr_probe(dev);
if (!err) {
+ strcpy(dev->name, "tr%d");
err = register_netdev(dev);
if (err)
ibmtr_cleanup_card(dev);
@@ -699,6 +700,7 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
printk(version);
}
#endif /* !PCMCIA */
+ sprintf(dev->name, "ibmtr@%04x", PIOaddr);
DPRINTK("%s %s found\n",
channel_def[cardpresent - 1], adapter_def(ti->adapter_type));
DPRINTK("using irq %d, PIOaddr %hx, %dK shared RAM.\n",
--
Meelis Roos (mroos@linux.ee)
next reply other threads:[~2010-10-02 18:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-02 18:35 Meelis Roos [this message]
2010-10-04 3:56 ` [PATCH] ibmtr: fix tr%d in dmesg David Miller
2010-10-04 21:12 ` Meelis Roos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.SOC.1.00.1010022056000.27121@math.ut.ee \
--to=mroos@linux.ee \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).