Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / drivers / net / wan / hostess_sv11.c

diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index e817583..3d80e42 100644 (file)
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -20,6 +20,8 @@
  *     Generic HDLC port Copyright (C) 2008 Krzysztof Halasa <khc@pm.waw.pl>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
@@ -192,8 +194,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq)
         */
 
        if (!request_region(iobase, 8, "Comtrol SV11")) {
-               printk(KERN_WARNING "hostess: I/O 0x%X already in use.\n",
-                      iobase);
+               pr_warn("I/O 0x%X already in use\n", iobase);
                return NULL;
        }
 
@@ -221,7 +222,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq)
 
        if (request_irq(irq, z8530_interrupt, IRQF_DISABLED,
                        "Hostess SV11", sv) < 0) {
-               printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);
+               pr_warn("IRQ %d already in use\n", irq);
                goto err_irq;
        }
 
@@ -255,7 +256,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq)
         */
 
        if (z8530_init(sv)) {
-               printk(KERN_ERR "Z8530 series device not found.\n");
+               pr_err("Z8530 series device not found\n");
                enable_irq(irq);
                goto free_dma;
        }
@@ -282,7 +283,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq)
        netdev->irq = irq;
 
        if (register_hdlc_device(netdev)) {
-               printk(KERN_ERR "hostess: unable to register HDLC device.\n");
+               pr_err("unable to register HDLC device\n");
                free_netdev(netdev);
                goto free_dma;
        }