Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6

[mv-sheeva.git] / drivers / net / usb / int51x1.c

diff --git a/drivers/net/usb/int51x1.c b/drivers/net/usb/int51x1.c
index 9ab5c1983a7dc47aab89b2c6a823e3f5ae35b2bf..be02a25da71a4572fc96ac9d3c699da4db248822 100644 (file)
--- a/drivers/net/usb/int51x1.c
+++ b/drivers/net/usb/int51x1.c
@@ -29,6 +29,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
+#include <linux/slab.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb/usbnet.h>
@@ -51,7 +52,7 @@ static int int51x1_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
        int len;
 
        if (!(pskb_may_pull(skb, INT51X1_HEADER_SIZE))) {
-               deverr(dev, "unexpected tiny rx frame");
+               netdev_err(dev->net, "unexpected tiny rx frame\n");
                return 0;
        }
 
@@ -138,25 +139,25 @@ static void int51x1_set_multicast(struct net_device *netdev)
        if (netdev->flags & IFF_PROMISC) {
                /* do not expect to see traffic of other PLCs */
                filter |= PACKET_TYPE_PROMISCUOUS;
-               devinfo(dev, "promiscuous mode enabled");
+               netdev_info(dev->net, "promiscuous mode enabled\n");
        } else if (!netdev_mc_empty(netdev) ||
                  (netdev->flags & IFF_ALLMULTI)) {
                filter |= PACKET_TYPE_ALL_MULTICAST;
-               devdbg(dev, "receive all multicast enabled");
+               netdev_dbg(dev->net, "receive all multicast enabled\n");
        } else {
                /* ~PROMISCUOUS, ~MULTICAST */
-               devdbg(dev, "receive own packets only");
+               netdev_dbg(dev->net, "receive own packets only\n");
        }
 
        urb = usb_alloc_urb(0, GFP_ATOMIC);
        if (!urb) {
-               devwarn(dev, "Error allocating URB");
+               netdev_warn(dev->net, "Error allocating URB\n");
                return;
        }
 
        req = kmalloc(sizeof(*req), GFP_ATOMIC);
        if (!req) {
-               devwarn(dev, "Error allocating control msg");
+               netdev_warn(dev->net, "Error allocating control msg\n");
                goto out;
        }
 
@@ -173,7 +174,8 @@ static void int51x1_set_multicast(struct net_device *netdev)
 
        status = usb_submit_urb(urb, GFP_ATOMIC);
        if (status < 0) {
-               devwarn(dev, "Error submitting control msg, sts=%d", status);
+               netdev_warn(dev->net, "Error submitting control msg, sts=%d\n",
+                           status);
                goto out1;
        }
        return;