mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 15:20:41 +00:00
Code Issues Releases Wiki Activity

USB: yealink.c: remove err() usage

Browse source 
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>
This commit is contained in:
Greg Kroah-Hartman 2012-04-25 14:48:31 -07:00
parent 2385f3c3c7
commit 08813d35d2
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/input/misc/yealink.c
View file

@ -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,