summaryrefslogtreecommitdiff
path: root/drivers/input/joystick/iforce/iforce-packets.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-25 21:34:49 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-25 21:34:49 (GMT)
commit7b22a8855a727c5d8265508cbba05437a68f7043 (patch)
tree752493e7055d4152c3abe485c2e9ddb478594180 /drivers/input/joystick/iforce/iforce-packets.c
parent9451df0ee893dbdfca626f2888654f321d241460 (diff)
downloadlinux-fsl-qoriq-7b22a8855a727c5d8265508cbba05437a68f7043.tar.xz
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-packets.c')
-rw-r--r--drivers/input/joystick/iforce/iforce-packets.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c
index a17b500..137326a 100644
--- a/drivers/input/joystick/iforce/iforce-packets.c
+++ b/drivers/input/joystick/iforce/iforce-packets.c
@@ -257,7 +257,8 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
status = usb_submit_urb(iforce->ctrl, GFP_ATOMIC);
if (status) {
- err("usb_submit_urb failed %d", status);
+ dev_err(&iforce->usbdev->dev,
+ "usb_submit_urb failed %d\n", status);
return -1;
}
@@ -289,12 +290,15 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
return -1;
}
#else
- err("iforce_get_id_packet: iforce->bus = SERIO!");
+ dev_err(&iforce->dev->dev,
+ "iforce_get_id_packet: iforce->bus = SERIO!\n");
#endif
break;
default:
- err("iforce_get_id_packet: iforce->bus = %d", iforce->bus);
+ dev_err(&iforce->dev->dev,
+ "iforce_get_id_packet: iforce->bus = %d\n",
+ iforce->bus);
break;
}