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>

1 files changed, 49 insertions, 52 deletions

diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c
index aeb1ab03a9ee..f6994053c101 100644
--- a/drivers/net/usb/net1080.c
+++ b/drivers/net/usb/net1080.c
@@ -205,23 +205,24 @@ static inline void nc_dump_usbctl(struct usbnet *dev, u16 usbctl)
 {
         if (!netif_msg_link(dev))
                 return;
-        devdbg(dev, "net1080 %s-%s usbctl 0x%x:%s%s%s%s%s;"
-                        " this%s%s;"
-                        " other%s%s; r/o 0x%x",
-                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_OTHER) ? " FLUSH" : "",
-                (usbctl & USBCTL_DISCONN_OTHER) ? " DIS" : "",
-                (usbctl & USBCTL_FLUSH_THIS) ? " FLUSH" : "",
-                (usbctl & USBCTL_DISCONN_THIS) ? " DIS" : "",
-                usbctl & ~USBCTL_WRITABLE_MASK
-                );
+        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);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -250,28 +251,25 @@ static inline void nc_dump_status(struct usbnet *dev, u16 status)
 {
         if (!netif_msg_link(dev))
                 return;
-        devdbg(dev, "net1080 %s-%s status 0x%x:"
-                        " this (%c) PKT=%d%s%s%s;"
-                        " other PKT=%d%s%s%s; unspec 0x%x",
-                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
-                );
+        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);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -287,9 +285,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))
-                devdbg(dev, "net1080 %s-%s ttl 0x%x this = %d, other = %d",
-                        dev->udev->bus->bus_name, dev->udev->devpath,
-                        ttl, TTL_THIS(ttl), TTL_OTHER(ttl));
+                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));
 }
 
 /*-------------------------------------------------------------------------*/
@@ -335,10 +333,9 @@ static int net1080_reset(struct usbnet *dev)
         dbg("%s: assigned TTL, %d ms", dev->net->name, NC_READ_TTL_MS);
 
         if (netif_msg_link(dev))
-                devinfo(dev, "port %c, peer %sconnected",
-                        (status & STATUS_PORT_A) ? 'A' : 'B',
-                        (status & STATUS_CONN_OTHER) ? "" : "dis"
-                        );
+                netdev_info(dev->net, "port %c, peer %sconnected\n",
+                            (status & STATUS_PORT_A) ? 'A' : 'B',
+                            (status & STATUS_CONN_OTHER) ? "" : "dis");
         retval = 0;
 
 done:
@@ -416,7 +413,7 @@ static void nc_ensure_sync(struct usbnet *dev)
                 }
 
                 if (netif_msg_rx_err(dev))
-                        devdbg(dev, "flush net1080; too many framing errors");
+                        netdev_dbg(dev->net, "flush net1080; too many framing errors\n");
                 dev->frame_errors = 0;
         }
 }
@@ -486,8 +483,8 @@ static int net1080_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                 return 0;
         }
 #if 0
-        devdbg(dev, "frame <rx h %d p %d id %d", header->hdr_len,
-                header->packet_len, header->packet_id);
+        netdev_dbg(dev->net, "frame <rx h %d p %d id %d\n", header->hdr_len,
+                   header->packet_len, header->packet_id);
 #endif
         dev->frame_errors = 0;
         return 1;
@@ -547,9 +544,9 @@ encapsulate:
         trailer = (struct nc_trailer *) skb_put(skb, sizeof *trailer);
         put_unaligned(header->packet_id, &trailer->packet_id);
 #if 0
-        devdbg(dev, "frame >tx h %d p %d id %d",
-                header->hdr_len, header->packet_len,
-                header->packet_id);
+        netdev_dbg(dev->net, "frame >tx h %d p %d id %d\n",
+                   header->hdr_len, header->packet_len,
+                   header->packet_id);
 #endif
         return skb;
 }