USB: input: yealink.c: fix up dev_* messages

[linux-beck.git] / drivers / input / misc / yealink.c

diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index f4776e7f8c151ae62ec8e38c39d16ad0bec6c8e0..285a5bd6cbc941ad966d4d643a825ccb4e465736 100644 (file)
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -101,6 +101,7 @@ static const struct lcd_segment_map {
 struct yealink_dev {
        struct input_dev *idev;         /* input device */
        struct usb_device *udev;        /* usb device */
+       struct usb_interface *intf;     /* usb interface */
 
        /* irq input channel */
        struct yld_ctl_packet   *irq_data;
@@ -428,7 +429,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->intf->dev, "%s - urb status %d\n",
+                       __func__, status);
 
        switch (yld->irq_data->cmd) {
        case CMD_KEYPRESS:
@@ -437,13 +439,15 @@ static void urb_irq_callback(struct urb *urb)
                break;
 
        case CMD_SCANCODE:
-               dbg("get scancode %x", yld->irq_data->data[0]);
+               dev_dbg(&yld->intf->dev, "get scancode %x\n",
+                       yld->irq_data->data[0]);
 
                report_key(yld, map_p1k_to_key(yld->irq_data->data[0]));
                break;
 
        default:
-               err("unexpected response %x", yld->irq_data->cmd);
+               dev_err(&yld->intf->dev, "unexpected response %x\n",
+                       yld->irq_data->cmd);
        }
 
        yealink_do_idle_tasks(yld);
@@ -451,7 +455,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->intf->dev,
+                               "%s - usb_submit_urb failed %d\n",
+                               __func__, ret);
        }
 }
 
@@ -461,7 +467,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->intf->dev, "%s - urb status %d\n",
+                       __func__, status);
 
        switch (yld->ctl_data->cmd) {
        case CMD_KEYPRESS:
@@ -479,7 +486,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->intf->dev, "%s - usb_submit_urb failed %d\n",
+                       __func__, ret);
 }
 
 /*******************************************************************************
@@ -511,7 +519,7 @@ static int input_open(struct input_dev *dev)
        struct yealink_dev *yld = input_get_drvdata(dev);
        int i, ret;
 
-       dbg("%s", __func__);
+       dev_dbg(&yld->intf->dev, "%s\n", __func__);
 
        /* force updates to device */
        for (i = 0; i<sizeof(yld->master); i++)
@@ -526,8 +534,9 @@ static int input_open(struct input_dev *dev)
        yld->ctl_data->size     = 10;
        yld->ctl_data->sum      = 0x100-CMD_INIT-10;
        if ((ret = usb_submit_urb(yld->urb_ctl, GFP_KERNEL)) != 0) {
-               dbg("%s - usb_submit_urb failed with result %d",
-                    __func__, ret);
+               dev_dbg(&yld->intf->dev,
+                       "%s - usb_submit_urb failed with result %d\n",
+                       __func__, ret);
                return ret;
        }
        return 0;
@@ -876,6 +885,7 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                return -ENOMEM;
 
        yld->udev = udev;
+       yld->intf = intf;
 
        yld->idev = input_dev = input_allocate_device();
        if (!input_dev)
@@ -909,7 +919,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,