UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: keyspan_remote.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: 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:28 -07:00
parent 3f37d8e8e1
commit 4efeca581b
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/input/misc/keyspan_remote.c
View File

@ -267,7 +267,9 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 6; remote->data.tester = remote->data.tester >> 6;
remote->data.bits_left -= 6; remote->data.bits_left -= 6;
} else { } else {
err("%s - Unknown sequence found in system data.\n", __func__); dev_err(&remote->udev->dev,
"%s - Unknown sequence found in system data.\n",
__func__);
remote->stage = 0; remote->stage = 0;
return; return;
} }
@ -286,7 +288,9 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 6; remote->data.tester = remote->data.tester >> 6;
remote->data.bits_left -= 6; remote->data.bits_left -= 6;
} else { } else {
err("%s - Unknown sequence found in button data.\n", __func__); dev_err(&remote->udev->dev,
"%s - Unknown sequence found in button data.\n",
__func__);
remote->stage = 0; remote->stage = 0;
return; return;
} }
@ -302,7 +306,9 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 6; remote->data.tester = remote->data.tester >> 6;
remote->data.bits_left -= 6; remote->data.bits_left -= 6;
} else { } else {
err("%s - Error in message, invalid toggle.\n", __func__); dev_err(&remote->udev->dev,
"%s - Error in message, invalid toggle.\n",
__func__);
remote->stage = 0; remote->stage = 0;
return; return;
} }
@ -312,7 +318,8 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 5; remote->data.tester = remote->data.tester >> 5;
remote->data.bits_left -= 5; remote->data.bits_left -= 5;
} else { } else {
err("Bad message received, no stop bit found.\n"); dev_err(&remote->udev->dev,
"Bad message received, no stop bit found.\n");
} }
dev_dbg(&remote->udev->dev, dev_dbg(&remote->udev->dev,
@ -397,7 +404,9 @@ static void keyspan_irq_recv(struct urb *urb)
resubmit: resubmit:
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
err ("%s - usb_submit_urb failed with result: %d", __func__, retval); dev_err(&dev->udev->dev,
"%s - usb_submit_urb failed with result: %d\n",
__func__, retval);
} }
static int keyspan_open(struct input_dev *dev) static int keyspan_open(struct input_dev *dev)