USB: remove dbg() usage in USB networking drivers

The dbg() USB macro is so old, it predates me.  The USB networking drivers are
the last hold-out using this macro, and we want to get rid of it, so replace
the usage of it with the proper netdev_dbg() or dev_dbg() (depending on the
context) calls.

Some places we end up using a local variable for the debug call, so also
convert the other existing dev_* calls to use it as well, to save tiny amounts
of code space.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 32 insertions, 23 deletions

diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 26c5bebd9eca..18d9579123ea 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -236,7 +236,8 @@ static void catc_rx_done(struct urb *urb)
         }
 
         if (status) {
-                dbg("rx_done, status %d, length %d", status, urb->actual_length);
+                dev_dbg(&urb->dev->dev, "rx_done, status %d, length %d\n",
+                        status, urb->actual_length);
                 return;
         }
 
@@ -275,10 +276,11 @@ static void catc_rx_done(struct urb *urb)
                 if (atomic_read(&catc->recq_sz)) {
                         int state;
                         atomic_dec(&catc->recq_sz);
-                        dbg("getting extra packet");
+                        netdev_dbg(catc->netdev, "getting extra packet\n");
                         urb->dev = catc->usbdev;
                         if ((state = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
-                                dbg("submit(rx_urb) status %d", state);
+                                netdev_dbg(catc->netdev,
+                                           "submit(rx_urb) status %d\n", state);
                         }
                 } else {
                         clear_bit(RX_RUNNING, &catc->flags);
@@ -317,18 +319,20 @@ static void catc_irq_done(struct urb *urb)
                 return;
         /* -EPIPE:  should clear the halt */
         default:                /* error */
-                dbg("irq_done, status %d, data %02x %02x.", status, data[0], data[1]);
+                dev_dbg(&urb->dev->dev,
+                        "irq_done, status %d, data %02x %02x.\n",
+                        status, data[0], data[1]);
                 goto resubmit;
         }
 
         if (linksts == LinkGood) {
                 netif_carrier_on(catc->netdev);
-                dbg("link ok");
+                netdev_dbg(catc->netdev, "link ok\n");
         }
 
         if (linksts == LinkBad) {
                 netif_carrier_off(catc->netdev);
-                dbg("link bad");
+                netdev_dbg(catc->netdev, "link bad\n");
         }
 
         if (hasdata) {
@@ -385,7 +389,7 @@ static void catc_tx_done(struct urb *urb)
         int r, status = urb->status;
 
         if (status == -ECONNRESET) {
-                dbg("Tx Reset.");
+                dev_dbg(&urb->dev->dev, "Tx Reset.\n");
                 urb->status = 0;
                 catc->netdev->trans_start = jiffies;
                 catc->netdev->stats.tx_errors++;
@@ -395,7 +399,8 @@ static void catc_tx_done(struct urb *urb)
         }
 
         if (status) {
-                dbg("tx_done, status %d, length %d", status, urb->actual_length);
+                dev_dbg(&urb->dev->dev, "tx_done, status %d, length %d\n",
+                        status, urb->actual_length);
                 return;
         }
 
@@ -511,7 +516,8 @@ static void catc_ctrl_done(struct urb *urb)
         int status = urb->status;
 
         if (status)
-                dbg("ctrl_done, status %d, len %d.", status, urb->actual_length);
+                dev_dbg(&urb->dev->dev, "ctrl_done, status %d, len %d.\n",
+                        status, urb->actual_length);
 
         spin_lock_irqsave(&catc->ctrl_lock, flags);
 
@@ -667,7 +673,9 @@ static void catc_set_multicast_list(struct net_device *netdev)
                 f5u011_mchash_async(catc, catc->multicast);
                 if (catc->rxmode[0] != rx) {
                         catc->rxmode[0] = rx;
-                        dbg("Setting RX mode to %2.2X %2.2X", catc->rxmode[0], catc->rxmode[1]);
+                        netdev_dbg(catc->netdev,
+                                   "Setting RX mode to %2.2X %2.2X\n",
+                                   catc->rxmode[0], catc->rxmode[1]);
                         f5u011_rxmode_async(catc, catc->rxmode);
                 }
         }
@@ -766,6 +774,7 @@ static const struct net_device_ops catc_netdev_ops = {
 
 static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
+        struct device *dev = &intf->dev;
         struct usb_device *usbdev = interface_to_usbdev(intf);
         struct net_device *netdev;
         struct catc *catc;
@@ -774,7 +783,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
 
         if (usb_set_interface(usbdev,
                         intf->altsetting->desc.bInterfaceNumber, 1)) {
-                dev_err(&intf->dev, "Can't set altsetting 1.\n");
+                dev_err(dev, "Can't set altsetting 1.\n");
                 return -EIO;
         }
 
@@ -817,7 +826,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
         if (le16_to_cpu(usbdev->descriptor.idVendor) == 0x0423 && 
             le16_to_cpu(usbdev->descriptor.idProduct) == 0xa &&
             le16_to_cpu(catc->usbdev->descriptor.bcdDevice) == 0x0130) {
-                dbg("Testing for f5u011");
+                dev_dbg(dev, "Testing for f5u011\n");
                 catc->is_f5u011 = 1;            
                 atomic_set(&catc->recq_sz, 0);
                 pktsz = RX_PKT_SZ;
@@ -838,7 +847,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
                 catc->irq_buf, 2, catc_irq_done, catc, 1);
 
         if (!catc->is_f5u011) {
-                dbg("Checking memory size\n");
+                dev_dbg(dev, "Checking memory size\n");
 
                 i = 0x12345678;
                 catc_write_mem(catc, 0x7a80, &i, 4);
@@ -850,7 +859,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
                 case 0x12345678:
                         catc_set_reg(catc, TxBufCount, 8);
                         catc_set_reg(catc, RxBufCount, 32);
-                        dbg("64k Memory\n");
+                        dev_dbg(dev, "64k Memory\n");
                         break;
                 default:
                         dev_warn(&intf->dev,
@@ -858,49 +867,49 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
                 case 0x87654321:
                         catc_set_reg(catc, TxBufCount, 4);
                         catc_set_reg(catc, RxBufCount, 16);
-                        dbg("32k Memory\n");
+                        dev_dbg(dev, "32k Memory\n");
                         break;
                 }
           
-                dbg("Getting MAC from SEEROM.");
+                dev_dbg(dev, "Getting MAC from SEEROM.\n");
           
                 catc_get_mac(catc, netdev->dev_addr);
                 
-                dbg("Setting MAC into registers.");
+                dev_dbg(dev, "Setting MAC into registers.\n");
           
                 for (i = 0; i < 6; i++)
                         catc_set_reg(catc, StationAddr0 - i, netdev->dev_addr[i]);
                 
-                dbg("Filling the multicast list.");
+                dev_dbg(dev, "Filling the multicast list.\n");
           
                 memset(broadcast, 0xff, 6);
                 catc_multicast(broadcast, catc->multicast);
                 catc_multicast(netdev->dev_addr, catc->multicast);
                 catc_write_mem(catc, 0xfa80, catc->multicast, 64);
                 
-                dbg("Clearing error counters.");
+                dev_dbg(dev, "Clearing error counters.\n");
                 
                 for (i = 0; i < 8; i++)
                         catc_set_reg(catc, EthStats + i, 0);
                 catc->last_stats = jiffies;
                 
-                dbg("Enabling.");
+                dev_dbg(dev, "Enabling.\n");
                 
                 catc_set_reg(catc, MaxBurst, RX_MAX_BURST);
                 catc_set_reg(catc, OpModes, OpTxMerge | OpRxMerge | OpLenInclude | Op3MemWaits);
                 catc_set_reg(catc, LEDCtrl, LEDLink);
                 catc_set_reg(catc, RxUnit, RxEnable | RxPolarity | RxMultiCast);
         } else {
-                dbg("Performing reset\n");
+                dev_dbg(dev, "Performing reset\n");
                 catc_reset(catc);
                 catc_get_mac(catc, netdev->dev_addr);
                 
-                dbg("Setting RX Mode");
+                dev_dbg(dev, "Setting RX Mode\n");
                 catc->rxmode[0] = RxEnable | RxPolarity | RxMultiCast;
                 catc->rxmode[1] = 0;
                 f5u011_rxmode(catc, catc->rxmode);
         }
-        dbg("Init done.");
+        dev_dbg(dev, "Init done.\n");
         printk(KERN_INFO "%s: %s USB Ethernet at usb-%s-%s, %pM.\n",
                netdev->name, (catc->is_f5u011) ? "Belkin F5U011" : "CATC EL1210A NetMate",
                usbdev->bus->bus_name, usbdev->devpath, netdev->dev_addr);