diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 17:48:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 17:48:34 -0400 |
commit | b59c82bd6f9d60dd09dd2c696fb1894802ae3e33 (patch) | |
tree | 81e4c2e1b6fc3c2fe20a3d27a8499564bd31a005 /drivers/input | |
parent | 6c1d1b246199c75486f5ffa677cf0e411ce4ac6e (diff) |
USB: acecad.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>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/tablet/acecad.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c index f8b0b1df9138..da6c34106190 100644 --- a/drivers/input/tablet/acecad.c +++ b/drivers/input/tablet/acecad.c | |||
@@ -105,8 +105,10 @@ static void usb_acecad_irq(struct urb *urb) | |||
105 | resubmit: | 105 | resubmit: |
106 | status = usb_submit_urb(urb, GFP_ATOMIC); | 106 | status = usb_submit_urb(urb, GFP_ATOMIC); |
107 | if (status) | 107 | if (status) |
108 | err("can't resubmit intr, %s-%s/input0, status %d", | 108 | dev_err(&acecad->usbdev->dev, |
109 | acecad->usbdev->bus->bus_name, acecad->usbdev->devpath, status); | 109 | "can't resubmit intr, %s-%s/input0, status %d\n", |
110 | acecad->usbdev->bus->bus_name, | ||
111 | acecad->usbdev->devpath, status); | ||
110 | } | 112 | } |
111 | 113 | ||
112 | static int usb_acecad_open(struct input_dev *dev) | 114 | static int usb_acecad_open(struct input_dev *dev) |