diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 17:48:20 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 17:48:20 -0400 |
commit | 185a85518a6f0649c1d9ca959fa51c6b4dac292a (patch) | |
tree | 090da84d4165f2a9859689122320148a69de3413 /drivers/hid/usbhid/usbmouse.c | |
parent | 7b22a8855a727c5d8265508cbba05437a68f7043 (diff) |
USB: usbmouse.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: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid/usbhid/usbmouse.c')
-rw-r--r-- | drivers/hid/usbhid/usbmouse.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c index 0f6be45d43d5..bf16d72dc370 100644 --- a/drivers/hid/usbhid/usbmouse.c +++ b/drivers/hid/usbhid/usbmouse.c | |||
@@ -92,9 +92,10 @@ static void usb_mouse_irq(struct urb *urb) | |||
92 | resubmit: | 92 | resubmit: |
93 | status = usb_submit_urb (urb, GFP_ATOMIC); | 93 | status = usb_submit_urb (urb, GFP_ATOMIC); |
94 | if (status) | 94 | if (status) |
95 | err ("can't resubmit intr, %s-%s/input0, status %d", | 95 | dev_err(&mouse->usbdev->dev, |
96 | mouse->usbdev->bus->bus_name, | 96 | "can't resubmit intr, %s-%s/input0, status %d\n", |
97 | mouse->usbdev->devpath, status); | 97 | mouse->usbdev->bus->bus_name, |
98 | mouse->usbdev->devpath, status); | ||
98 | } | 99 | } |
99 | 100 | ||
100 | static int usb_mouse_open(struct input_dev *dev) | 101 | static int usb_mouse_open(struct input_dev *dev) |