USB: yealink.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: Henk Vergonet <Henk.Vergonet@gmail.com>
CC: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index f4776e7f8c151ae62ec8e38c39d16ad0bec6c8e0..4984823b368159345a9e766d4b41d91497598e72 100644 (file)
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -428,7 +428,8 @@ static void urb_irq_callback(struct urb *urb)
        int ret, status = urb->status;
 
        if (status)
-               err("%s - urb status %d", __func__, status);
+               dev_err(&yld->udev->dev, "%s - urb status %d\n",
+                       __func__, status);
 
        switch (yld->irq_data->cmd) {
        case CMD_KEYPRESS:
@@ -443,7 +444,8 @@ static void urb_irq_callback(struct urb *urb)
                break;
 
        default:
-               err("unexpected response %x", yld->irq_data->cmd);
+               dev_err(&yld->udev->dev, "unexpected response %x\n",
+                       yld->irq_data->cmd);
        }
 
        yealink_do_idle_tasks(yld);
@@ -451,7 +453,9 @@ static void urb_irq_callback(struct urb *urb)
        if (!yld->shutdown) {
                ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC);
                if (ret && ret != -EPERM)
-                       err("%s - usb_submit_urb failed %d", __func__, ret);
+                       dev_err(&yld->udev->dev,
+                               "%s - usb_submit_urb failed %d\n",
+                               __func__, ret);
        }
 }
 
@@ -461,7 +465,8 @@ static void urb_ctl_callback(struct urb *urb)
        int ret = 0, status = urb->status;
 
        if (status)
-               err("%s - urb status %d", __func__, status);
+               dev_err(&yld->udev->dev, "%s - urb status %d\n",
+                       __func__, status);
 
        switch (yld->ctl_data->cmd) {
        case CMD_KEYPRESS:
@@ -479,7 +484,8 @@ static void urb_ctl_callback(struct urb *urb)
        }
 
        if (ret && ret != -EPERM)
-               err("%s - usb_submit_urb failed %d", __func__, ret);
+               dev_err(&yld->udev->dev, "%s - usb_submit_urb failed %d\n",
+                       __func__, ret);
 }
 
 /*******************************************************************************
@@ -909,7 +915,8 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
        pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);
        ret = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
        if (ret != USB_PKT_LEN)
-               err("invalid payload size %d, expected %zd", ret, USB_PKT_LEN);
+               dev_err(&intf->dev, "invalid payload size %d, expected %zd\n",
+                       ret, USB_PKT_LEN);
 
        /* initialise irq urb */
        usb_fill_int_urb(yld->urb_irq, udev, pipe, yld->irq_data,