USB: remove warn() macro from usb net drivers

[linux-2.6-omap-h63xx.git] / drivers / net / usb / rtl8150.c

diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index df56a518691c6c9fb5664c2f972082ac84fdf693..7726b5e8676422e32aba94794894101c2f95665d 100644 (file)
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -221,7 +221,7 @@ static void ctrl_callback(struct urb *urb)
        case -ENOENT:
                break;
        default:
-               warn("ctrl urb status %d", urb->status);
+               dev_warn(&urb->dev->dev, "ctrl urb status %d\n", urb->status);
        }
        dev = urb->context;
        clear_bit(RX_REG_SET, &dev->flags);
@@ -441,10 +441,10 @@ static void read_bulk_callback(struct urb *urb)
        case -ENOENT:
                return; /* the urb is in unlink state */
        case -ETIME:
-               warn("may be reset is needed?..");
+               dev_warn(&urb->dev->dev, "may be reset is needed?..\n");
                goto goon;
        default:
-               warn("Rx status %d", urb->status);
+               dev_warn(&urb->dev->dev, "Rx status %d\n", urb->status);
                goto goon;
        }
 
@@ -665,7 +665,7 @@ static int enable_net_traffic(rtl8150_t * dev)
        u8 cr, tcr, rcr, msr;
 
        if (!rtl8150_reset(dev)) {
-               warn("%s - device reset failed", __FUNCTION__);
+               dev_warn(&dev->udev->dev, "device reset failed\n");
        }
        /* RCR bit7=1 attach Rx info at the end;  =0 HW CRC (which is broken) */
        rcr = 0x9e;
@@ -699,7 +699,7 @@ static struct net_device_stats *rtl8150_netdev_stats(struct net_device *dev)
 static void rtl8150_tx_timeout(struct net_device *netdev)
 {
        rtl8150_t *dev = netdev_priv(netdev);
-       warn("%s: Tx timeout.", netdev->name);
+       dev_warn(&netdev->dev, "Tx timeout.\n");
        usb_unlink_urb(dev->tx_urb);
        dev->stats.tx_errors++;
 }
@@ -740,7 +740,7 @@ static int rtl8150_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                if (res == -ENODEV)
                        netif_device_detach(dev->netdev);
                else {
-                       warn("failed tx_urb %d\n", res);
+                       dev_warn(&netdev->dev, "failed tx_urb %d\n", res);
                        dev->stats.tx_errors++;
                        netif_start_queue(netdev);
                }
@@ -783,7 +783,7 @@ static int rtl8150_open(struct net_device *netdev)
        if ((res = usb_submit_urb(dev->rx_urb, GFP_KERNEL))) {
                if (res == -ENODEV)
                        netif_device_detach(dev->netdev);
-               warn("%s: rx_urb submit failed: %d", __FUNCTION__, res);
+               dev_warn(&netdev->dev, "rx_urb submit failed: %d\n", res);
                return res;
        }
        usb_fill_int_urb(dev->intr_urb, dev->udev, usb_rcvintpipe(dev->udev, 3),
@@ -792,7 +792,7 @@ static int rtl8150_open(struct net_device *netdev)
        if ((res = usb_submit_urb(dev->intr_urb, GFP_KERNEL))) {
                if (res == -ENODEV)
                        netif_device_detach(dev->netdev);
-               warn("%s: intr_urb submit failed: %d", __FUNCTION__, res);
+               dev_warn(&netdev->dev, "intr_urb submit failed: %d\n", res);
                usb_kill_urb(dev->rx_urb);
                return res;
        }