Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 24297b2..46ceb3a 100644 (file)
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -14,6 +14,8 @@
  *     2000-10-29      Henner Eisen    lapb_data_indication() return status.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 
 #include <asm/system.h>
@@ -96,7 +98,7 @@ static struct x25_asy *x25_asy_alloc(void)
                        x25_asy_devs[i] = dev;
                        return sl;
                } else {
-                       printk(KERN_WARNING "x25_asy_alloc() - register_netdev() failure.\n");
+                       pr_warn("%s(): register_netdev() failure\n", __func__);
                        free_netdev(dev);
                }
        }
@@ -114,8 +116,7 @@ static void x25_asy_free(struct x25_asy *sl)
        sl->xbuff = NULL;
 
        if (!test_and_clear_bit(SLF_INUSE, &sl->flags))
-               printk(KERN_ERR "%s: x25_asy_free for already free unit.\n",
-                       sl->dev->name);
+               netdev_err(sl->dev, "x25_asy_free for already free unit\n");
 }
 
 static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
@@ -128,8 +129,7 @@ static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
        rbuff = kmalloc(len + 4, GFP_ATOMIC);
 
        if (xbuff == NULL || rbuff == NULL) {
-               printk(KERN_WARNING "%s: unable to grow X.25 buffers, MTU change cancelled.\n",
-                      dev->name);
+               netdev_warn(dev, "unable to grow X.25 buffers, MTU change cancelled\n");
                kfree(xbuff);
                kfree(rbuff);
                return -ENOMEM;
@@ -198,8 +198,7 @@ static void x25_asy_bump(struct x25_asy *sl)
 
        skb = dev_alloc_skb(count+1);
        if (skb == NULL) {
-               printk(KERN_WARNING "%s: memory squeeze, dropping packet.\n",
-                       sl->dev->name);
+               netdev_warn(sl->dev, "memory squeeze, dropping packet\n");
                dev->stats.rx_dropped++;
                return;
        }
@@ -287,9 +286,9 @@ static void x25_asy_timeout(struct net_device *dev)
                /* May be we must check transmitter timeout here ?
                 *      14 Oct 1994 Dmitry Gorodchanin.
                 */
-               printk(KERN_WARNING "%s: transmit timed out, %s?\n", dev->name,
-                      (tty_chars_in_buffer(sl->tty) || sl->xleft) ?
-                      "bad line quality" : "driver error");
+               netdev_warn(dev, "transmit timed out, %s?\n",
+                           (tty_chars_in_buffer(sl->tty) || sl->xleft) ?
+                           "bad line quality" : "driver error");
                sl->xleft = 0;
                clear_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
                x25_asy_unlock(sl);
@@ -306,8 +305,7 @@ static netdev_tx_t x25_asy_xmit(struct sk_buff *skb,
        int err;
 
        if (!netif_running(sl->dev)) {
-               printk(KERN_ERR "%s: xmit call when iface is down\n",
-                       dev->name);
+               netdev_err(dev, "xmit call when iface is down\n");
                kfree_skb(skb);
                return NETDEV_TX_OK;
        }
@@ -318,13 +316,15 @@ static netdev_tx_t x25_asy_xmit(struct sk_buff *skb,
        case X25_IFACE_CONNECT: /* Connection request .. do nothing */
                err = lapb_connect_request(dev);
                if (err != LAPB_OK)
-                       printk(KERN_ERR "x25_asy: lapb_connect_request error - %d\n", err);
+                       netdev_err(dev, "lapb_connect_request error: %d\n",
+                                  err);
                kfree_skb(skb);
                return NETDEV_TX_OK;
        case X25_IFACE_DISCONNECT: /* do nothing - hang up ?? */
                err = lapb_disconnect_request(dev);
                if (err != LAPB_OK)
-                       printk(KERN_ERR "x25_asy: lapb_disconnect_request error - %d\n", err);
+                       netdev_err(dev, "lapb_disconnect_request error: %d\n",
+                                  err);
        default:
                kfree_skb(skb);
                return NETDEV_TX_OK;
@@ -343,7 +343,7 @@ static netdev_tx_t x25_asy_xmit(struct sk_buff *skb,
 
        err = lapb_data_request(dev, skb);
        if (err != LAPB_OK) {
-               printk(KERN_ERR "x25_asy: lapb_data_request error - %d\n", err);
+               netdev_err(dev, "lapb_data_request error: %d\n", err);
                kfree_skb(skb);
                return NETDEV_TX_OK;
        }
@@ -378,7 +378,7 @@ static void x25_asy_data_transmit(struct net_device *dev, struct sk_buff *skb)
        spin_lock(&sl->lock);
        if (netif_queue_stopped(sl->dev) || sl->tty == NULL) {
                spin_unlock(&sl->lock);
-               printk(KERN_ERR "x25_asy: tbusy drop\n");
+               netdev_err(dev, "tbusy drop\n");
                kfree_skb(skb);
                return;
        }
@@ -404,7 +404,7 @@ static void x25_asy_connected(struct net_device *dev, int reason)
 
        skb = dev_alloc_skb(1);
        if (skb == NULL) {
-               printk(KERN_ERR "x25_asy: out of memory\n");
+               netdev_err(dev, "out of memory\n");
                return;
        }
 
@@ -423,7 +423,7 @@ static void x25_asy_disconnected(struct net_device *dev, int reason)
 
        skb = dev_alloc_skb(1);
        if (skb == NULL) {
-               printk(KERN_ERR "x25_asy: out of memory\n");
+               netdev_err(dev, "out of memory\n");
                return;
        }
 
@@ -603,8 +603,8 @@ static void x25_asy_close_tty(struct tty_struct *tty)
 
        err = lapb_unregister(sl->dev);
        if (err != LAPB_OK)
-               printk(KERN_ERR "x25_asy_close: lapb_unregister error -%d\n",
-                       err);
+               pr_err("x25_asy_close: lapb_unregister error: %d\n",
+                      err);
 
        tty->disc_data = NULL;
        sl->tty = NULL;
@@ -782,14 +782,13 @@ static int __init init_x25_asy(void)
        if (x25_asy_maxdev < 4)
                x25_asy_maxdev = 4; /* Sanity */
 
-       printk(KERN_INFO "X.25 async: version 0.00 ALPHA "
-                       "(dynamic channels, max=%d).\n", x25_asy_maxdev);
+       pr_info("X.25 async: version 0.00 ALPHA (dynamic channels, max=%d)\n",
+               x25_asy_maxdev);
 
        x25_asy_devs = kcalloc(x25_asy_maxdev, sizeof(struct net_device *),
                                GFP_KERNEL);
        if (!x25_asy_devs) {
-               printk(KERN_WARNING "X25 async: Can't allocate x25_asy_ctrls[] "
-                               "array! Uaargh! (-> No X.25 available)\n");
+               pr_warn("Can't allocate x25_asy_ctrls[] array! Uaargh! (-> No X.25 available)\n");
                return -ENOMEM;
        }