diff options
author | Joe Perches <joe@perches.com> | 2011-06-26 15:01:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-27 03:09:46 -0400 |
commit | 12a3bfefc8c1e43ddb50950cb74f8a11d680567a (patch) | |
tree | ff974d28811618a51ab8dcbef1588a1022cb9c74 /drivers/net/wan/c101.c | |
parent | 2903dd654d8788425a9523959b02933ea6555229 (diff) |
generic_hdlc: 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/c101.c')
-rw-r--r-- | drivers/net/wan/c101.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c index 4ac85a09c5a..54f995f4a5a 100644 --- a/drivers/net/wan/c101.c +++ b/drivers/net/wan/c101.c | |||
@@ -14,6 +14,8 @@ | |||
14 | * Moxa C101 User's Manual | 14 | * Moxa C101 User's Manual |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
18 | |||
17 | #include <linux/module.h> | 19 | #include <linux/module.h> |
18 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
19 | #include <linux/capability.h> | 21 | #include <linux/capability.h> |
@@ -313,44 +315,44 @@ static int __init c101_run(unsigned long irq, unsigned long winbase) | |||
313 | int result; | 315 | int result; |
314 | 316 | ||
315 | if (irq<3 || irq>15 || irq == 6) /* FIXME */ { | 317 | if (irq<3 || irq>15 || irq == 6) /* FIXME */ { |
316 | printk(KERN_ERR "c101: invalid IRQ value\n"); | 318 | pr_err("invalid IRQ value\n"); |
317 | return -ENODEV; | 319 | return -ENODEV; |
318 | } | 320 | } |
319 | 321 | ||
320 | if (winbase < 0xC0000 || winbase > 0xDFFFF || (winbase & 0x3FFF) !=0) { | 322 | if (winbase < 0xC0000 || winbase > 0xDFFFF || (winbase & 0x3FFF) !=0) { |
321 | printk(KERN_ERR "c101: invalid RAM value\n"); | 323 | pr_err("invalid RAM value\n"); |
322 | return -ENODEV; | 324 | return -ENODEV; |
323 | } | 325 | } |
324 | 326 | ||
325 | card = kzalloc(sizeof(card_t), GFP_KERNEL); | 327 | card = kzalloc(sizeof(card_t), GFP_KERNEL); |
326 | if (card == NULL) { | 328 | if (card == NULL) { |
327 | printk(KERN_ERR "c101: unable to allocate memory\n"); | 329 | pr_err("unable to allocate memory\n"); |
328 | return -ENOBUFS; | 330 | return -ENOBUFS; |
329 | } | 331 | } |
330 | 332 | ||
331 | card->dev = alloc_hdlcdev(card); | 333 | card->dev = alloc_hdlcdev(card); |
332 | if (!card->dev) { | 334 | if (!card->dev) { |
333 | printk(KERN_ERR "c101: unable to allocate memory\n"); | 335 | pr_err("unable to allocate memory\n"); |
334 | kfree(card); | 336 | kfree(card); |
335 | return -ENOBUFS; | 337 | return -ENOBUFS; |
336 | } | 338 | } |
337 | 339 | ||
338 | if (request_irq(irq, sca_intr, 0, devname, card)) { | 340 | if (request_irq(irq, sca_intr, 0, devname, card)) { |
339 | printk(KERN_ERR "c101: could not allocate IRQ\n"); | 341 | pr_err("could not allocate IRQ\n"); |
340 | c101_destroy_card(card); | 342 | c101_destroy_card(card); |
341 | return -EBUSY; | 343 | return -EBUSY; |
342 | } | 344 | } |
343 | card->irq = irq; | 345 | card->irq = irq; |
344 | 346 | ||
345 | if (!request_mem_region(winbase, C101_MAPPED_RAM_SIZE, devname)) { | 347 | if (!request_mem_region(winbase, C101_MAPPED_RAM_SIZE, devname)) { |
346 | printk(KERN_ERR "c101: could not request RAM window\n"); | 348 | pr_err("could not request RAM window\n"); |
347 | c101_destroy_card(card); | 349 | c101_destroy_card(card); |
348 | return -EBUSY; | 350 | return -EBUSY; |
349 | } | 351 | } |
350 | card->phy_winbase = winbase; | 352 | card->phy_winbase = winbase; |
351 | card->win0base = ioremap(winbase, C101_MAPPED_RAM_SIZE); | 353 | card->win0base = ioremap(winbase, C101_MAPPED_RAM_SIZE); |
352 | if (!card->win0base) { | 354 | if (!card->win0base) { |
353 | printk(KERN_ERR "c101: could not map I/O address\n"); | 355 | pr_err("could not map I/O address\n"); |
354 | c101_destroy_card(card); | 356 | c101_destroy_card(card); |
355 | return -EFAULT; | 357 | return -EFAULT; |
356 | } | 358 | } |
@@ -381,7 +383,7 @@ static int __init c101_run(unsigned long irq, unsigned long winbase) | |||
381 | 383 | ||
382 | result = register_hdlc_device(dev); | 384 | result = register_hdlc_device(dev); |
383 | if (result) { | 385 | if (result) { |
384 | printk(KERN_WARNING "c101: unable to register hdlc device\n"); | 386 | pr_warn("unable to register hdlc device\n"); |
385 | c101_destroy_card(card); | 387 | c101_destroy_card(card); |
386 | return result; | 388 | return result; |
387 | } | 389 | } |
@@ -389,10 +391,8 @@ static int __init c101_run(unsigned long irq, unsigned long winbase) | |||
389 | sca_init_port(card); /* Set up C101 memory */ | 391 | sca_init_port(card); /* Set up C101 memory */ |
390 | set_carrier(card); | 392 | set_carrier(card); |
391 | 393 | ||
392 | printk(KERN_INFO "%s: Moxa C101 on IRQ%u," | 394 | netdev_info(dev, "Moxa C101 on IRQ%u, using %u TX + %u RX packets rings\n", |
393 | " using %u TX + %u RX packets rings\n", | 395 | card->irq, card->tx_ring_buffers, card->rx_ring_buffers); |
394 | dev->name, card->irq, | ||
395 | card->tx_ring_buffers, card->rx_ring_buffers); | ||
396 | 396 | ||
397 | *new_card = card; | 397 | *new_card = card; |
398 | new_card = &card->next_card; | 398 | new_card = &card->next_card; |
@@ -405,12 +405,12 @@ static int __init c101_init(void) | |||
405 | { | 405 | { |
406 | if (hw == NULL) { | 406 | if (hw == NULL) { |
407 | #ifdef MODULE | 407 | #ifdef MODULE |
408 | printk(KERN_INFO "c101: no card initialized\n"); | 408 | pr_info("no card initialized\n"); |
409 | #endif | 409 | #endif |
410 | return -EINVAL; /* no parameters specified, abort */ | 410 | return -EINVAL; /* no parameters specified, abort */ |
411 | } | 411 | } |
412 | 412 | ||
413 | printk(KERN_INFO "%s\n", version); | 413 | pr_info("%s\n", version); |
414 | 414 | ||
415 | do { | 415 | do { |
416 | unsigned long irq, ram; | 416 | unsigned long irq, ram; |
@@ -428,7 +428,7 @@ static int __init c101_init(void) | |||
428 | return first_card ? 0 : -EINVAL; | 428 | return first_card ? 0 : -EINVAL; |
429 | }while(*hw++ == ':'); | 429 | }while(*hw++ == ':'); |
430 | 430 | ||
431 | printk(KERN_ERR "c101: invalid hardware parameters\n"); | 431 | pr_err("invalid hardware parameters\n"); |
432 | return first_card ? 0 : -EINVAL; | 432 | return first_card ? 0 : -EINVAL; |
433 | } | 433 | } |
434 | 434 | ||