Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c
index 23300656c266..5f3b97668e63 100644
--- a/drivers/net/usb/cdc_eem.c
+++ b/drivers/net/usb/cdc_eem.c
@@ -30,6 +30,7 @@
 #include <linux/crc32.h>
 #include <linux/usb/cdc.h>
 #include <linux/usb/usbnet.h>
+#include <linux/gfp.h>
 
 
 /*
@@ -73,7 +74,7 @@ static void eem_linkcmd(struct usbnet *dev, struct sk_buff *skb)
                 usb_free_urb(urb);
 fail:
                 dev_kfree_skb(skb);
-                devwarn(dev, "link cmd failure\n");
+                netdev_warn(dev->net, "link cmd failure\n");
                 return;
         }
 }
@@ -121,8 +122,8 @@ static struct sk_buff *eem_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
                 int     headroom = skb_headroom(skb);
                 int     tailroom = skb_tailroom(skb);
 
-                if ((tailroom >= ETH_FCS_LEN + padlen)
-                                && (headroom >= EEM_HEAD))
+                if ((tailroom >= ETH_FCS_LEN + padlen) &&
+                    (headroom >= EEM_HEAD))
                         goto done;
 
                 if ((headroom + tailroom)
@@ -212,7 +213,8 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                          * b15:         1 (EEM command)
                          */
                         if (header & BIT(14)) {
-                                devdbg(dev, "reserved command %04x\n", header);
+                                netdev_dbg(dev->net, "reserved command %04x\n",
+                                           header);
                                 continue;
                         }
 
@@ -255,8 +257,9 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                         case 1:         /* Echo response */
                         case 5:         /* Tickle */
                         default:        /* reserved */
-                                devwarn(dev, "unexpected link command %d\n",
-                                                bmEEMCmd);
+                                netdev_warn(dev->net,
+                                            "unexpected link command %d\n",
+                                            bmEEMCmd);
                                 continue;
                         }