diff options
author | Joe Perches <joe@perches.com> | 2011-06-26 15:01:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-27 03:09:47 -0400 |
commit | 23efcb738ea51befe0674e0685fc6cfe353aa553 (patch) | |
tree | f5bbf62acc9bfa2b771b8ecb6ece5cbb771e9e98 /drivers/net/wan/sealevel.c | |
parent | c75bb2c6f0cf455c23e60f14d780e841dd47f801 (diff) |
wan: Update to current logging forms
Use pr_fmt, pr_<level> and netdev_<level> as appropriate.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan/sealevel.c')
-rw-r--r-- | drivers/net/wan/sealevel.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c index e91457d6023e..0b4fd05e1508 100644 --- a/drivers/net/wan/sealevel.c +++ b/drivers/net/wan/sealevel.c | |||
@@ -12,6 +12,8 @@ | |||
12 | * | 12 | * |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
16 | |||
15 | #include <linux/module.h> | 17 | #include <linux/module.h> |
16 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
17 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
@@ -190,7 +192,7 @@ static int slvl_setup(struct slvl_device *sv, int iobase, int irq) | |||
190 | dev->irq = irq; | 192 | dev->irq = irq; |
191 | 193 | ||
192 | if (register_hdlc_device(dev)) { | 194 | if (register_hdlc_device(dev)) { |
193 | printk(KERN_ERR "sealevel: unable to register HDLC device\n"); | 195 | pr_err("unable to register HDLC device\n"); |
194 | free_netdev(dev); | 196 | free_netdev(dev); |
195 | return -1; | 197 | return -1; |
196 | } | 198 | } |
@@ -215,8 +217,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq, | |||
215 | */ | 217 | */ |
216 | 218 | ||
217 | if (!request_region(iobase, 8, "Sealevel 4021")) { | 219 | if (!request_region(iobase, 8, "Sealevel 4021")) { |
218 | printk(KERN_WARNING "sealevel: I/O 0x%X already in use.\n", | 220 | pr_warn("I/O 0x%X already in use\n", iobase); |
219 | iobase); | ||
220 | return NULL; | 221 | return NULL; |
221 | } | 222 | } |
222 | 223 | ||
@@ -267,7 +268,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq, | |||
267 | 268 | ||
268 | if (request_irq(irq, z8530_interrupt, IRQF_DISABLED, | 269 | if (request_irq(irq, z8530_interrupt, IRQF_DISABLED, |
269 | "SeaLevel", dev) < 0) { | 270 | "SeaLevel", dev) < 0) { |
270 | printk(KERN_WARNING "sealevel: IRQ %d already in use.\n", irq); | 271 | pr_warn("IRQ %d already in use\n", irq); |
271 | goto err_request_irq; | 272 | goto err_request_irq; |
272 | } | 273 | } |
273 | 274 | ||
@@ -292,7 +293,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq, | |||
292 | */ | 293 | */ |
293 | 294 | ||
294 | if (z8530_init(dev) != 0) { | 295 | if (z8530_init(dev) != 0) { |
295 | printk(KERN_ERR "Z8530 series device not found.\n"); | 296 | pr_err("Z8530 series device not found\n"); |
296 | enable_irq(irq); | 297 | enable_irq(irq); |
297 | goto free_hw; | 298 | goto free_hw; |
298 | } | 299 | } |