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, 8 insertions, 7 deletions

diff --git a/drivers/net/usb/int51x1.c b/drivers/net/usb/int51x1.c
index 9ab5c1983a7d..3c228df57062 100644
--- a/drivers/net/usb/int51x1.c
+++ b/drivers/net/usb/int51x1.c
@@ -51,7 +51,7 @@ static int int51x1_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
         int len;
 
         if (!(pskb_may_pull(skb, INT51X1_HEADER_SIZE))) {
-                deverr(dev, "unexpected tiny rx frame");
+                netdev_err(dev->net, "unexpected tiny rx frame\n");
                 return 0;
         }
 
@@ -138,25 +138,25 @@ static void int51x1_set_multicast(struct net_device *netdev)
         if (netdev->flags & IFF_PROMISC) {
                 /* do not expect to see traffic of other PLCs */
                 filter |= PACKET_TYPE_PROMISCUOUS;
-                devinfo(dev, "promiscuous mode enabled");
+                netdev_info(dev->net, "promiscuous mode enabled\n");
         } else if (!netdev_mc_empty(netdev) ||
                   (netdev->flags & IFF_ALLMULTI)) {
                 filter |= PACKET_TYPE_ALL_MULTICAST;
-                devdbg(dev, "receive all multicast enabled");
+                netdev_dbg(dev->net, "receive all multicast enabled\n");
         } else {
                 /* ~PROMISCUOUS, ~MULTICAST */
-                devdbg(dev, "receive own packets only");
+                netdev_dbg(dev->net, "receive own packets only\n");
         }
 
         urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!urb) {
-                devwarn(dev, "Error allocating URB");
+                netdev_warn(dev->net, "Error allocating URB\n");
                 return;
         }
 
         req = kmalloc(sizeof(*req), GFP_ATOMIC);
         if (!req) {
-                devwarn(dev, "Error allocating control msg");
+                netdev_warn(dev->net, "Error allocating control msg\n");
                 goto out;
         }
 
@@ -173,7 +173,8 @@ static void int51x1_set_multicast(struct net_device *netdev)
 
         status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status < 0) {
-                devwarn(dev, "Error submitting control msg, sts=%d", status);
+                netdev_warn(dev->net, "Error submitting control msg, sts=%d\n",
+                            status);
                 goto out1;
         }
         return;