diff options
Diffstat (limited to 'drivers/net/usb/cdc_ether.c')
-rw-r--r-- | drivers/net/usb/cdc_ether.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 4f27f022fbf7..7e5a75269cc5 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c | |||
@@ -340,9 +340,9 @@ EXPORT_SYMBOL_GPL(usbnet_cdc_unbind); | |||
340 | static void dumpspeed(struct usbnet *dev, __le32 *speeds) | 340 | static void dumpspeed(struct usbnet *dev, __le32 *speeds) |
341 | { | 341 | { |
342 | if (netif_msg_timer(dev)) | 342 | if (netif_msg_timer(dev)) |
343 | devinfo(dev, "link speeds: %u kbps up, %u kbps down", | 343 | netdev_info(dev->net, "link speeds: %u kbps up, %u kbps down\n", |
344 | __le32_to_cpu(speeds[0]) / 1000, | 344 | __le32_to_cpu(speeds[0]) / 1000, |
345 | __le32_to_cpu(speeds[1]) / 1000); | 345 | __le32_to_cpu(speeds[1]) / 1000); |
346 | } | 346 | } |
347 | 347 | ||
348 | static void cdc_status(struct usbnet *dev, struct urb *urb) | 348 | static void cdc_status(struct usbnet *dev, struct urb *urb) |
@@ -362,8 +362,8 @@ static void cdc_status(struct usbnet *dev, struct urb *urb) | |||
362 | switch (event->bNotificationType) { | 362 | switch (event->bNotificationType) { |
363 | case USB_CDC_NOTIFY_NETWORK_CONNECTION: | 363 | case USB_CDC_NOTIFY_NETWORK_CONNECTION: |
364 | if (netif_msg_timer(dev)) | 364 | if (netif_msg_timer(dev)) |
365 | devdbg(dev, "CDC: carrier %s", | 365 | netdev_dbg(dev->net, "CDC: carrier %s\n", |
366 | event->wValue ? "on" : "off"); | 366 | event->wValue ? "on" : "off"); |
367 | if (event->wValue) | 367 | if (event->wValue) |
368 | netif_carrier_on(dev->net); | 368 | netif_carrier_on(dev->net); |
369 | else | 369 | else |
@@ -371,8 +371,8 @@ static void cdc_status(struct usbnet *dev, struct urb *urb) | |||
371 | break; | 371 | break; |
372 | case USB_CDC_NOTIFY_SPEED_CHANGE: /* tx/rx rates */ | 372 | case USB_CDC_NOTIFY_SPEED_CHANGE: /* tx/rx rates */ |
373 | if (netif_msg_timer(dev)) | 373 | if (netif_msg_timer(dev)) |
374 | devdbg(dev, "CDC: speed change (len %d)", | 374 | netdev_dbg(dev->net, "CDC: speed change (len %d)\n", |
375 | urb->actual_length); | 375 | urb->actual_length); |
376 | if (urb->actual_length != (sizeof *event + 8)) | 376 | if (urb->actual_length != (sizeof *event + 8)) |
377 | set_bit(EVENT_STS_SPLIT, &dev->flags); | 377 | set_bit(EVENT_STS_SPLIT, &dev->flags); |
378 | else | 378 | else |
@@ -382,8 +382,8 @@ static void cdc_status(struct usbnet *dev, struct urb *urb) | |||
382 | * but there are no standard formats for the response data. | 382 | * but there are no standard formats for the response data. |
383 | */ | 383 | */ |
384 | default: | 384 | default: |
385 | deverr(dev, "CDC: unexpected notification %02x!", | 385 | netdev_err(dev->net, "CDC: unexpected notification %02x!\n", |
386 | event->bNotificationType); | 386 | event->bNotificationType); |
387 | break; | 387 | break; |
388 | } | 388 | } |
389 | } | 389 | } |