USB: rtl8150.c: remove err() usage

err() was a very old USB-specific macro that I thought had
gone away.  This patch removes it from being used in the
driver and uses dev_err() instead.

CC: Petko Manolov <petkan@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index d363b31053da..65854cdcedc8 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -203,7 +203,8 @@ static int async_set_registers(rtl8150_t * dev, u16 indx, u16 size)
         if ((ret = usb_submit_urb(dev->ctrl_urb, GFP_ATOMIC))) {
                 if (ret == -ENODEV)
                         netif_device_detach(dev->netdev);
-                err("control request submission failed: %d", ret);
+                dev_err(&dev->udev->dev,
+                        "control request submission failed: %d\n", ret);
         } else
                 set_bit(RX_REG_SET, &dev->flags);
 
@@ -516,9 +517,9 @@ resubmit:
         if (res == -ENODEV)
                 netif_device_detach(dev->netdev);
         else if (res)
-                err ("can't resubmit intr, %s-%s/input0, status %d",
-                                dev->udev->bus->bus_name,
-                                dev->udev->devpath, res);
+                dev_err(&dev->udev->dev,
+                        "can't resubmit intr, %s-%s/input0, status %d\n",
+                        dev->udev->bus->bus_name, dev->udev->devpath, res);
 }
 
 static int rtl8150_suspend(struct usb_interface *intf, pm_message_t message)
@@ -890,11 +891,11 @@ static int rtl8150_probe(struct usb_interface *intf,
         dev->intr_interval = 100;       /* 100ms */
 
         if (!alloc_all_urbs(dev)) {
-                err("out of memory");
+                dev_err(&intf->dev, "out of memory\n");
                 goto out;
         }
         if (!rtl8150_reset(dev)) {
-                err("couldn't reset the device");
+                dev_err(&intf->dev, "couldn't reset the device\n");
                 goto out1;
         }
         fill_skb_pool(dev);
@@ -903,7 +904,7 @@ static int rtl8150_probe(struct usb_interface *intf,
         usb_set_intfdata(intf, dev);
         SET_NETDEV_DEV(netdev, &intf->dev);
         if (register_netdev(netdev) != 0) {
-                err("couldn't register the device");
+                dev_err(&intf->dev, "couldn't register the device\n");
                 goto out2;
         }