diff options
author | Joe Perches <joe@perches.com> | 2010-08-12 08:22:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-18 17:26:30 -0400 |
commit | 636b8116d4e116eca1ac978f546b16fadfc15a6c (patch) | |
tree | 287364907b68208a473472e9f6314b64ced16d3d /drivers/net/pcmcia/ibmtr_cs.c | |
parent | 00093fab980d0a8950a64bdf9e346d0497b9a7e4 (diff) |
drivers/net/pcmcia: Use pr_<level> and netdev_<level>
On Mon, 2010-08-09 at 17:34 +0200, Dominik Brodowski wrote:
> look good from a PCMCIA point of view, therefore:
> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
If PCMCIA is still being looked after, then here's
another for you, maybe for 2.6.37.
Use the more descriptive logging message styles.
There are whitespace/indentation errors in the original
sources that these changes do not modify, so checkpatch
errors were cheerfully ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/pcmcia/ibmtr_cs.c')
-rw-r--r-- | drivers/net/pcmcia/ibmtr_cs.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index cbcda123b1bf..dc85282193bf 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c | |||
@@ -45,6 +45,8 @@ | |||
45 | 45 | ||
46 | ======================================================================*/ | 46 | ======================================================================*/ |
47 | 47 | ||
48 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
49 | |||
48 | #include <linux/kernel.h> | 50 | #include <linux/kernel.h> |
49 | #include <linux/init.h> | 51 | #include <linux/init.h> |
50 | #include <linux/ptrace.h> | 52 | #include <linux/ptrace.h> |
@@ -272,15 +274,14 @@ static int __devinit ibmtr_config(struct pcmcia_device *link) | |||
272 | 274 | ||
273 | i = ibmtr_probe_card(dev); | 275 | i = ibmtr_probe_card(dev); |
274 | if (i != 0) { | 276 | if (i != 0) { |
275 | printk(KERN_NOTICE "ibmtr_cs: register_netdev() failed\n"); | 277 | pr_notice("register_netdev() failed\n"); |
276 | goto failed; | 278 | goto failed; |
277 | } | 279 | } |
278 | 280 | ||
279 | printk(KERN_INFO | 281 | netdev_info(dev, "port %#3lx, irq %d, mmio %#5lx, sram %#5lx, hwaddr=%pM\n", |
280 | "%s: port %#3lx, irq %d, mmio %#5lx, sram %#5lx, hwaddr=%pM\n", | 282 | dev->base_addr, dev->irq, |
281 | dev->name, dev->base_addr, dev->irq, | 283 | (u_long)ti->mmio, (u_long)(ti->sram_base << 12), |
282 | (u_long)ti->mmio, (u_long)(ti->sram_base << 12), | 284 | dev->dev_addr); |
283 | dev->dev_addr); | ||
284 | return 0; | 285 | return 0; |
285 | 286 | ||
286 | failed: | 287 | failed: |