summaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/iforce/iforce-usb.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2012-04-25 23:34:49 +0200
committerGreg Kroah-Hartman2012-04-25 23:34:49 +0200
commit7b22a8855a727c5d8265508cbba05437a68f7043 (patch)
tree752493e7055d4152c3abe485c2e9ddb478594180 /drivers/input/joystick/iforce/iforce-usb.c
parentUSB: staging: media: as102: convert to use module_usb_driver (diff)
downloadkernel-qcow2-linux-7b22a8855a727c5d8265508cbba05437a68f7043.tar.gz
kernel-qcow2-linux-7b22a8855a727c5d8265508cbba05437a68f7043.tar.xz
kernel-qcow2-linux-7b22a8855a727c5d8265508cbba05437a68f7043.zip
USB: iforce: 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/joystick/iforce/iforce-usb.c')
-rw-r--r--drivers/input/joystick/iforce/iforce-usb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index 6c96631ae5d9..ecbfae7d7539 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -100,8 +100,9 @@ static void iforce_usb_irq(struct urb *urb)
exit:
status = usb_submit_urb (urb, GFP_ATOMIC);
if (status)
- err ("%s - usb_submit_urb failed with result %d",
- __func__, status);
+ dev_err(&iforce->usbdev->dev,
+ "%s - usb_submit_urb failed with result %d\n",
+ __func__, status);
}
static void iforce_usb_out(struct urb *urb)