aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/cdc_eem.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-02-17 05:30:23 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-17 16:35:40 -0500
commit60b86755929e1a7e9038c8d860a8491cfdf8d93a (patch)
tree97062c7136ead4adcdbf2bd3280143da1fabbe20 /drivers/net/usb/cdc_eem.c
parent82456b031e3c3b5bf95a7e49bd9b68b146446e76 (diff)
usbnet: Convert dev(dbg|err|warn|info) macros to netdev_<level>
These macros are too similar to the dev_<level> equivalents but take a usbnet * argument. Convert them to the recently introduced netdev_<level> macros and remove the old macros. The old macros had "\n" appended to the format string. Add the "\n" to the converted uses. Some existing uses of the dev<foo> macros in cdc_eem.c probably mistakenly had trailing "\n". No "\n" added there. Fix net1080 this/other log message inversion. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/cdc_eem.c')
-rw-r--r--drivers/net/usb/cdc_eem.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c
index c337ffc3304a..a4a85a6ed86d 100644
--- a/drivers/net/usb/cdc_eem.c
+++ b/drivers/net/usb/cdc_eem.c
@@ -73,7 +73,7 @@ static void eem_linkcmd(struct usbnet *dev, struct sk_buff *skb)
73 usb_free_urb(urb); 73 usb_free_urb(urb);
74fail: 74fail:
75 dev_kfree_skb(skb); 75 dev_kfree_skb(skb);
76 devwarn(dev, "link cmd failure\n"); 76 netdev_warn(dev->net, "link cmd failure\n");
77 return; 77 return;
78 } 78 }
79} 79}
@@ -212,7 +212,8 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
212 * b15: 1 (EEM command) 212 * b15: 1 (EEM command)
213 */ 213 */
214 if (header & BIT(14)) { 214 if (header & BIT(14)) {
215 devdbg(dev, "reserved command %04x\n", header); 215 netdev_dbg(dev->net, "reserved command %04x\n",
216 header);
216 continue; 217 continue;
217 } 218 }
218 219
@@ -255,8 +256,9 @@ static int eem_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
255 case 1: /* Echo response */ 256 case 1: /* Echo response */
256 case 5: /* Tickle */ 257 case 5: /* Tickle */
257 default: /* reserved */ 258 default: /* reserved */
258 devwarn(dev, "unexpected link command %d\n", 259 netdev_warn(dev->net,
259 bmEEMCmd); 260 "unexpected link command %d\n",
261 bmEEMCmd);
260 continue; 262 continue;
261 } 263 }
262 264