diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 17:48:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 17:48:44 -0400 |
commit | b3169fecb10594ac1182de904d367631a4dbdf1c (patch) | |
tree | 4a46af787c5d857f464b3e498736ea7b1185ae02 /drivers/input/tablet | |
parent | 202712c2322a1b87f3359046f5ebe92e0384ff6d (diff) |
USB: wacom_sys.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>
CC: Ping Cheng <pingc@wacom.com>
CC: Chris Bagwell <chris@cnpbagwell.com>
CC: Eduard Hasenleithner <eduard@hasenleithner.at>
CC: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/tablet')
-rw-r--r-- | drivers/input/tablet/wacom_sys.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 0d269212931e..3db4684a0b77 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c | |||
@@ -122,8 +122,9 @@ static void wacom_sys_irq(struct urb *urb) | |||
122 | usb_mark_last_busy(wacom->usbdev); | 122 | usb_mark_last_busy(wacom->usbdev); |
123 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 123 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
124 | if (retval) | 124 | if (retval) |
125 | err ("%s - usb_submit_urb failed with result %d", | 125 | dev_err(&wacom->intf->dev, |
126 | __func__, retval); | 126 | "%s - usb_submit_urb failed with result %d\n", |
127 | __func__, retval); | ||
127 | } | 128 | } |
128 | 129 | ||
129 | static int wacom_open(struct input_dev *dev) | 130 | static int wacom_open(struct input_dev *dev) |