6 files changed, 264 insertions, 341 deletions

diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 7e5a75269cc5..3486e8ca039a 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -339,10 +339,10 @@ EXPORT_SYMBOL_GPL(usbnet_cdc_unbind);
 
 static void dumpspeed(struct usbnet *dev, __le32 *speeds)
 {
-        if (netif_msg_timer(dev))
-                netdev_info(dev->net, "link speeds: %u kbps up, %u kbps down\n",
-                            __le32_to_cpu(speeds[0]) / 1000,
-                            __le32_to_cpu(speeds[1]) / 1000);
+        netif_info(dev, timer, dev->net,
+                   "link speeds: %u kbps up, %u kbps down\n",
+                   __le32_to_cpu(speeds[0]) / 1000,
+                   __le32_to_cpu(speeds[1]) / 1000);
 }
 
 static void cdc_status(struct usbnet *dev, struct urb *urb)
@@ -361,18 +361,16 @@ static void cdc_status(struct usbnet *dev, struct urb *urb)
         event = urb->transfer_buffer;
         switch (event->bNotificationType) {
         case USB_CDC_NOTIFY_NETWORK_CONNECTION:
-                if (netif_msg_timer(dev))
-                        netdev_dbg(dev->net, "CDC: carrier %s\n",
-                                   event->wValue ? "on" : "off");
+                netif_dbg(dev, timer, dev->net, "CDC: carrier %s\n",
+                          event->wValue ? "on" : "off");
                 if (event->wValue)
                         netif_carrier_on(dev->net);
                 else
                         netif_carrier_off(dev->net);
                 break;
         case USB_CDC_NOTIFY_SPEED_CHANGE:       /* tx/rx rates */
-                if (netif_msg_timer(dev))
-                        netdev_dbg(dev->net, "CDC: speed change (len %d)\n",
-                                   urb->actual_length);
+                netif_dbg(dev, timer, dev->net, "CDC: speed change (len %d)\n",
+                          urb->actual_length);
                 if (urb->actual_length != (sizeof *event + 8))
                         set_bit(EVENT_STS_SPLIT, &dev->flags);
                 else
diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c
index f6994053c101..bdcad45954a3 100644
--- a/drivers/net/usb/net1080.c
+++ b/drivers/net/usb/net1080.c
@@ -203,26 +203,23 @@ static void nc_dump_registers(struct usbnet *dev)
 
 static inline void nc_dump_usbctl(struct usbnet *dev, u16 usbctl)
 {
-        if (!netif_msg_link(dev))
-                return;
-        netdev_dbg(dev->net, "net1080 %s-%s usbctl 0x%x:%s%s%s%s%s;"
-                   " this%s%s;"
-                   " other%s%s; r/o 0x%x\n",
-                   dev->udev->bus->bus_name, dev->udev->devpath,
-                   usbctl,
-                   (usbctl & USBCTL_ENABLE_LANG) ? " lang" : "",
-                   (usbctl & USBCTL_ENABLE_MFGR) ? " mfgr" : "",
-                   (usbctl & USBCTL_ENABLE_PROD) ? " prod" : "",
-                   (usbctl & USBCTL_ENABLE_SERIAL) ? " serial" : "",
-                   (usbctl & USBCTL_ENABLE_DEFAULTS) ? " defaults" : "",
-
-                   (usbctl & USBCTL_FLUSH_THIS) ? " FLUSH" : "",
-                   (usbctl & USBCTL_DISCONN_THIS) ? " DIS" : "",
-
-                   (usbctl & USBCTL_FLUSH_OTHER) ? " FLUSH" : "",
-                   (usbctl & USBCTL_DISCONN_OTHER) ? " DIS" : "",
-
-                   usbctl & ~USBCTL_WRITABLE_MASK);
+        netif_dbg(dev, link, dev->net,
+                  "net1080 %s-%s usbctl 0x%x:%s%s%s%s%s; this%s%s; other%s%s; r/o 0x%x\n",
+                  dev->udev->bus->bus_name, dev->udev->devpath,
+                  usbctl,
+                  (usbctl & USBCTL_ENABLE_LANG) ? " lang" : "",
+                  (usbctl & USBCTL_ENABLE_MFGR) ? " mfgr" : "",
+                  (usbctl & USBCTL_ENABLE_PROD) ? " prod" : "",
+                  (usbctl & USBCTL_ENABLE_SERIAL) ? " serial" : "",
+                  (usbctl & USBCTL_ENABLE_DEFAULTS) ? " defaults" : "",
+
+                  (usbctl & USBCTL_FLUSH_THIS) ? " FLUSH" : "",
+                  (usbctl & USBCTL_DISCONN_THIS) ? " DIS" : "",
+
+                  (usbctl & USBCTL_FLUSH_OTHER) ? " FLUSH" : "",
+                  (usbctl & USBCTL_DISCONN_OTHER) ? " DIS" : "",
+
+                  usbctl & ~USBCTL_WRITABLE_MASK);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -249,27 +246,26 @@ static inline void nc_dump_usbctl(struct usbnet *dev, u16 usbctl)
 
 static inline void nc_dump_status(struct usbnet *dev, u16 status)
 {
-        if (!netif_msg_link(dev))
-                return;
-        netdev_dbg(dev->net, "net1080 %s-%s status 0x%x: this (%c) PKT=%d%s%s%s; other PKT=%d%s%s%s; unspec 0x%x\n",
-                   dev->udev->bus->bus_name, dev->udev->devpath,
-                   status,
-
-                   // XXX the packet counts don't seem right
-                   // (1 at reset, not 0); maybe UNSPEC too
-
-                   (status & STATUS_PORT_A) ? 'A' : 'B',
-                   STATUS_PACKETS_THIS(status),
-                   (status & STATUS_CONN_THIS) ? " CON" : "",
-                   (status & STATUS_SUSPEND_THIS) ? " SUS" : "",
-                   (status & STATUS_MAILBOX_THIS) ? " MBOX" : "",
-
-                   STATUS_PACKETS_OTHER(status),
-                   (status & STATUS_CONN_OTHER) ? " CON" : "",
-                   (status & STATUS_SUSPEND_OTHER) ? " SUS" : "",
-                   (status & STATUS_MAILBOX_OTHER) ? " MBOX" : "",
-
-                   status & STATUS_UNSPEC_MASK);
+        netif_dbg(dev, link, dev->net,
+                  "net1080 %s-%s status 0x%x: this (%c) PKT=%d%s%s%s; other PKT=%d%s%s%s; unspec 0x%x\n",
+                  dev->udev->bus->bus_name, dev->udev->devpath,
+                  status,
+
+                  // XXX the packet counts don't seem right
+                  // (1 at reset, not 0); maybe UNSPEC too
+
+                  (status & STATUS_PORT_A) ? 'A' : 'B',
+                  STATUS_PACKETS_THIS(status),
+                  (status & STATUS_CONN_THIS) ? " CON" : "",
+                  (status & STATUS_SUSPEND_THIS) ? " SUS" : "",
+                  (status & STATUS_MAILBOX_THIS) ? " MBOX" : "",
+
+                  STATUS_PACKETS_OTHER(status),
+                  (status & STATUS_CONN_OTHER) ? " CON" : "",
+                  (status & STATUS_SUSPEND_OTHER) ? " SUS" : "",
+                  (status & STATUS_MAILBOX_OTHER) ? " MBOX" : "",
+
+                  status & STATUS_UNSPEC_MASK);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -284,10 +280,9 @@ static inline void nc_dump_status(struct usbnet *dev, u16 status)
 
 static inline void nc_dump_ttl(struct usbnet *dev, u16 ttl)
 {
-        if (netif_msg_link(dev))
-                netdev_dbg(dev->net, "net1080 %s-%s ttl 0x%x this = %d, other = %d\n",
-                           dev->udev->bus->bus_name, dev->udev->devpath,
-                           ttl, TTL_THIS(ttl), TTL_OTHER(ttl));
+        netif_dbg(dev, link, dev->net, "net1080 %s-%s ttl 0x%x this = %d, other = %d\n",
+                  dev->udev->bus->bus_name, dev->udev->devpath,
+                  ttl, TTL_THIS(ttl), TTL_OTHER(ttl));
 }
 
 /*-------------------------------------------------------------------------*/
@@ -332,10 +327,9 @@ static int net1080_reset(struct usbnet *dev)
                         MK_TTL(NC_READ_TTL_MS, TTL_OTHER(ttl)) );
         dbg("%s: assigned TTL, %d ms", dev->net->name, NC_READ_TTL_MS);
 
-        if (netif_msg_link(dev))
-                netdev_info(dev->net, "port %c, peer %sconnected\n",
-                            (status & STATUS_PORT_A) ? 'A' : 'B',
-                            (status & STATUS_CONN_OTHER) ? "" : "dis");
+        netif_info(dev, link, dev->net, "port %c, peer %sconnected\n",
+                   (status & STATUS_PORT_A) ? 'A' : 'B',
+                   (status & STATUS_CONN_OTHER) ? "" : "dis");
         retval = 0;
 
 done:
@@ -412,8 +406,8 @@ static void nc_ensure_sync(struct usbnet *dev)
                         return;
                 }
 
-                if (netif_msg_rx_err(dev))
-                        netdev_dbg(dev->net, "flush net1080; too many framing errors\n");
+                netif_dbg(dev, rx_err, dev->net,
+                          "flush net1080; too many framing errors\n");
                 dev->frame_errors = 0;
         }
 }
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 44ae8f6d3135..41838773b568 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -132,9 +132,10 @@ static void ctrl_callback(struct urb *urb)
         case -ENOENT:
                 break;
         default:
-                if (netif_msg_drv(pegasus) && printk_ratelimit())
-                        dev_dbg(&pegasus->intf->dev, "%s, status %d\n",
+                if (net_ratelimit())
+                        netif_dbg(pegasus, drv, pegasus->net,