can: replace the dev_dbg/info/err/... with the new netdev_xxx macros

Cc: uclinux-dist-devel@blackfin.uclinux.org
Cc: Anant Gole <anantgole@ti.com>
Cc: Chris Elston <celston@katalix.com>
Cc: Sebastian Haas <haas@ems-wuensche.com>
Cc: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Sebastian Haas <dev@sebastianhaas.info>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

2 files changed, 35 insertions, 49 deletions

diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index 9783e02fbc26..7ae65fc80032 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -288,8 +288,7 @@ static void ems_usb_read_interrupt_callback(struct urb *urb)
                 return;
 
         default:
-                dev_info(netdev->dev.parent, "Rx interrupt aborted %d\n",
-                         urb->status);
+                netdev_info(netdev, "Rx interrupt aborted %d\n", urb->status);
                 break;
         }
 
@@ -298,8 +297,7 @@ static void ems_usb_read_interrupt_callback(struct urb *urb)
         if (err == -ENODEV)
                 netif_device_detach(netdev);
         else if (err)
-                dev_err(netdev->dev.parent,
-                        "failed resubmitting intr urb: %d\n", err);
+                netdev_err(netdev, "failed resubmitting intr urb: %d\n", err);
 }
 
 static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg)
@@ -431,8 +429,7 @@ static void ems_usb_read_bulk_callback(struct urb *urb)
                 return;
 
         default:
-                dev_info(netdev->dev.parent, "Rx URB aborted (%d)\n",
-                         urb->status);
+                netdev_info(netdev, "Rx URB aborted (%d)\n", urb->status);
                 goto resubmit_urb;
         }
 
@@ -477,7 +474,7 @@ static void ems_usb_read_bulk_callback(struct urb *urb)
                         msg_count--;
 
                         if (start > urb->transfer_buffer_length) {
-                                dev_err(netdev->dev.parent, "format error\n");
+                                netdev_err(netdev, "format error\n");
                                 break;
                         }
                 }
@@ -493,8 +490,8 @@ resubmit_urb:
         if (retval == -ENODEV)
                 netif_device_detach(netdev);
         else if (retval)
-                dev_err(netdev->dev.parent,
-                        "failed resubmitting read bulk urb: %d\n", retval);
+                netdev_err(netdev,
+                           "failed resubmitting read bulk urb: %d\n", retval);
 }
 
 /*
@@ -521,8 +518,7 @@ static void ems_usb_write_bulk_callback(struct urb *urb)
                 return;
 
         if (urb->status)
-                dev_info(netdev->dev.parent, "Tx URB aborted (%d)\n",
-                         urb->status);
+                netdev_info(netdev, "Tx URB aborted (%d)\n", urb->status);
 
         netdev->trans_start = jiffies;
 
@@ -605,8 +601,7 @@ static int ems_usb_start(struct ems_usb *dev)
                 /* create a URB, and a buffer for it */
                 urb = usb_alloc_urb(0, GFP_KERNEL);
                 if (!urb) {
-                        dev_err(netdev->dev.parent,
-                                "No memory left for URBs\n");
+                        netdev_err(netdev, "No memory left for URBs\n");
                         err = -ENOMEM;
                         break;
                 }
@@ -614,8 +609,7 @@ static int ems_usb_start(struct ems_usb *dev)
                 buf = usb_alloc_coherent(dev->udev, RX_BUFFER_SIZE, GFP_KERNEL,
                                          &urb->transfer_dma);
                 if (!buf) {
-                        dev_err(netdev->dev.parent,
-                                "No memory left for USB buffer\n");
+                        netdev_err(netdev, "No memory left for USB buffer\n");
                         usb_free_urb(urb);
                         err = -ENOMEM;
                         break;
@@ -641,13 +635,13 @@ static int ems_usb_start(struct ems_usb *dev)
 
         /* Did we submit any URBs */
         if (i == 0) {
-                dev_warn(netdev->dev.parent, "couldn't setup read URBs\n");
+                netdev_warn(netdev, "couldn't setup read URBs\n");
                 return err;
         }
 
         /* Warn if we've couldn't transmit all the URBs */
         if (i < MAX_RX_URBS)
-                dev_warn(netdev->dev.parent, "rx performance may be slow\n");
+                netdev_warn(netdev, "rx performance may be slow\n");
 
         /* Setup and start interrupt URB */
         usb_fill_int_urb(dev->intr_urb, dev->udev,
@@ -658,8 +652,7 @@ static int ems_usb_start(struct ems_usb *dev)
 
         err = usb_submit_urb(dev->intr_urb, GFP_KERNEL);
         if (err) {
-                dev_warn(netdev->dev.parent, "intr URB submit failed: %d\n",
-                         err);
+                netdev_warn(netdev, "intr URB submit failed: %d\n", err);
 
                 return err;
         }
@@ -688,7 +681,7 @@ static int ems_usb_start(struct ems_usb *dev)
         return 0;
 
 failed:
-        dev_warn(netdev->dev.parent, "couldn't submit control: %d\n", err);
+        netdev_warn(netdev, "couldn't submit control: %d\n", err);
 
         return err;
 }
@@ -728,8 +721,7 @@ static int ems_usb_open(struct net_device *netdev)
                 if (err == -ENODEV)
                         netif_device_detach(dev->netdev);
 
-                dev_warn(netdev->dev.parent, "couldn't start device: %d\n",
-                         err);
+                netdev_warn(netdev, "couldn't start device: %d\n", err);
 
                 close_candev(netdev);
 
@@ -762,13 +754,13 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
         /* create a URB, and a buffer for it, and copy the data to the URB */
         urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!urb) {
-                dev_err(netdev->dev.parent, "No memory left for URBs\n");
+                netdev_err(netdev, "No memory left for URBs\n");
                 goto nomem;
         }
 
         buf = usb_alloc_coherent(dev->udev, size, GFP_ATOMIC, &urb->transfer_dma);
         if (!buf) {
-                dev_err(netdev->dev.parent, "No memory left for USB buffer\n");
+                netdev_err(netdev, "No memory left for USB buffer\n");
                 usb_free_urb(urb);
                 goto nomem;
         }
@@ -811,7 +803,7 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
                 usb_unanchor_urb(urb);
                 usb_free_coherent(dev->udev, size, buf, urb->transfer_dma);
 
-                dev_warn(netdev->dev.parent, "couldn't find free context\n");
+                netdev_warn(netdev, "couldn't find free context\n");
 
                 return NETDEV_TX_BUSY;
         }
@@ -842,7 +834,7 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
                 if (err == -ENODEV) {
                         netif_device_detach(netdev);
                 } else {
-                        dev_warn(netdev->dev.parent, "failed tx_urb %d\n", err);
+                        netdev_warn(netdev, "failed tx_urb %d\n", err);
 
                         stats->tx_dropped++;
                 }
@@ -882,7 +874,7 @@ static int ems_usb_close(struct net_device *netdev)
 
         /* Set CAN controller to reset mode */
         if (ems_usb_write_mode(dev, SJA1000_MOD_RM))
-                dev_warn(netdev->dev.parent, "couldn't stop device");
+                netdev_warn(netdev, "couldn't stop device");
 
         close_candev(netdev);
 
@@ -919,7 +911,7 @@ static int ems_usb_set_mode(struct net_device *netdev, enum can_mode mode)
         switch (mode) {
         case CAN_MODE_START:
                 if (ems_usb_write_mode(dev, SJA1000_MOD_NORMAL))
-                        dev_warn(netdev->dev.parent, "couldn't start device");
+                        netdev_warn(netdev, "couldn't start device");
 
                 if (netif_queue_stopped(netdev))
                         netif_wake_queue(netdev);
@@ -944,8 +936,7 @@ static int ems_usb_set_bittiming(struct net_device *netdev)
         if (dev->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)
                 btr1 |= 0x80;
 
-        dev_info(netdev->dev.parent, "setting BTR0=0x%02x BTR1=0x%02x\n",
-                 btr0, btr1);
+        netdev_info(netdev, "setting BTR0=0x%02x BTR1=0x%02x\n", btr0, btr1);
 
         dev->active_params.msg.can_params.cc_params.sja1000.btr0 = btr0;
         dev->active_params.msg.can_params.cc_params.sja1000.btr1 = btr1;
@@ -1050,15 +1041,13 @@ static int ems_usb_probe(struct usb_interface *intf,
 
         err = ems_usb_command_msg(dev, &dev->active_params);
         if (err) {
-                dev_err(netdev->dev.parent,
-                        "couldn't initialize controller: %d\n", err);
+                netdev_err(netdev, "couldn't initialize controller: %d\n", err);
                 goto cleanup_tx_msg_buffer;
         }
 
         err = register_candev(netdev);
         if (err) {
-                dev_err(netdev->dev.parent,
-                        "couldn't register CAN device: %d\n", err);
+                netdev_err(netdev, "couldn't register CAN device: %d\n", err);
                 goto cleanup_tx_msg_buffer;
         }
 
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
index 92774637aad8..09b1da5bc512 100644
--- a/drivers/net/can/usb/esd_usb2.c
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -470,8 +470,7 @@ static void esd_usb2_write_bulk_callback(struct urb *urb)
                 return;
 
         if (urb->status)
-                dev_info(netdev->dev.parent, "Tx URB aborted (%d)\n",
-                         urb->status);
+                netdev_info(netdev, "Tx URB aborted (%d)\n", urb->status);
 
         netdev->trans_start = jiffies;
 }
@@ -651,7 +650,7 @@ failed:
         if (err == -ENODEV)
                 netif_device_detach(netdev);
 
-        dev_err(netdev->dev.parent, "couldn't start device: %d\n", err);
+        netdev_err(netdev, "couldn't start device: %d\n", err);
 
         return err;
 }
@@ -687,8 +686,7 @@ static int esd_usb2_open(struct net_device *netdev)
         /* finally start device */
         err = esd_usb2_start(priv);
         if (err) {
-                dev_warn(netdev->dev.parent,
-                         "couldn't start device: %d\n", err);
+                netdev_warn(netdev, "couldn't start device: %d\n", err);
                 close_candev(netdev);
                 return err;
         }
@@ -721,7 +719,7 @@ static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb,
         /* create a URB, and a buffer for it, and copy the data to the URB */
         urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!urb) {
-                dev_err(netdev->dev.parent, "No memory left for URBs\n");
+                netdev_err(netdev, "No memory left for URBs\n");
                 stats->tx_dropped++;
                 dev_kfree_skb(skb);
                 goto nourbmem;
@@ -730,7 +728,7 @@ static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb,
         buf = usb_alloc_coherent(dev->udev, size, GFP_ATOMIC,
                                  &urb->transfer_dma);
         if (!buf) {
-                dev_err(netdev->dev.parent, "No memory left for USB buffer\n");
+                netdev_err(netdev, "No memory left for USB buffer\n");
                 stats->tx_dropped++;
                 dev_kfree_skb(skb);
                 goto nobufmem;
@@ -766,7 +764,7 @@ static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb,
          * This may never happen.
          */
         if (!context) {
-                dev_warn(netdev->dev.parent, "couldn't find free context\n");
+                netdev_warn(netdev, "couldn't find free context\n");
                 ret = NETDEV_TX_BUSY;
                 goto releasebuf;
         }
@@ -806,7 +804,7 @@ static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb,
                 if (err == -ENODEV)
                         netif_device_detach(netdev);
                 else
-                        dev_warn(netdev->dev.parent, "failed tx_urb %d\n", err);
+                        netdev_warn(netdev, "failed tx_urb %d\n", err);
 
                 goto releasebuf;
         }
@@ -845,7 +843,7 @@ static int esd_usb2_close(struct net_device *netdev)
         for (i = 0; i <= ESD_MAX_ID_SEGMENT; i++)
                 msg.msg.filter.mask[i] = 0;
         if (esd_usb2_send_msg(priv->usb2, &msg) < 0)
-                dev_err(netdev->dev.parent, "sending idadd message failed\n");
+                netdev_err(netdev, "sending idadd message failed\n");
 
         /* set CAN controller to reset mode */
         msg.msg.hdr.len = 2;
@@ -854,7 +852,7 @@ static int esd_usb2_close(struct net_device *netdev)
         msg.msg.setbaud.rsvd = 0;
         msg.msg.setbaud.baud = cpu_to_le32(ESD_USB2_NO_BAUDRATE);
         if (esd_usb2_send_msg(priv->usb2, &msg) < 0)
-                dev_err(netdev->dev.parent, "sending setbaud message failed\n");
+                netdev_err(netdev, "sending setbaud message failed\n");
 
         priv->can.state = CAN_STATE_STOPPED;
 
@@ -910,7 +908,7 @@ static int esd_usb2_set_bittiming(struct net_device *netdev)
         msg.msg.setbaud.rsvd = 0;
         msg.msg.setbaud.baud = cpu_to_le32(canbtr);
 
-        dev_info(netdev->dev.parent, "setting BTR=%#x\n", canbtr);
+        netdev_info(netdev, "setting BTR=%#x\n", canbtr);
 
         return esd_usb2_send_msg(priv->usb2, &msg);
 }
@@ -988,15 +986,14 @@ static int esd_usb2_probe_one_net(struct usb_interface *intf, int index)
 
         err = register_candev(netdev);
         if (err) {
-                dev_err(&intf->dev,
-                        "couldn't register CAN device: %d\n", err);
+                dev_err(&intf->dev, "couldn't register CAN device: %d\n", err);
                 free_candev(netdev);
                 err = -ENOMEM;
                 goto done;
         }
 
         dev->nets[index] = priv;
-        dev_info(netdev->dev.parent, "device %s registered\n", netdev->name);
+        netdev_info(netdev, "device %s registered\n", netdev->name);
 
 done:
         return err;