Commit 9cb757bf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: xpad.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: "Magnus Hörlin" <magnus@alefors.se>
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Mauro Carvalho Chehab <mchehab@redhat.com>
CC: Chris Moeller <kode54@gmail.c>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 185a8551
...@@ -492,8 +492,9 @@ static void xpad_irq_in(struct urb *urb) ...@@ -492,8 +492,9 @@ static void xpad_irq_in(struct urb *urb)
exit: exit:
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
err ("%s - usb_submit_urb failed with result %d", dev_err(&xpad->udev->dev,
__func__, retval); "%s - usb_submit_urb failed with result %d\n",
__func__, retval);
} }
static void xpad_bulk_out(struct urb *urb) static void xpad_bulk_out(struct urb *urb)
...@@ -516,6 +517,7 @@ static void xpad_bulk_out(struct urb *urb) ...@@ -516,6 +517,7 @@ static void xpad_bulk_out(struct urb *urb)
#if defined(CONFIG_JOYSTICK_XPAD_FF) || defined(CONFIG_JOYSTICK_XPAD_LEDS) #if defined(CONFIG_JOYSTICK_XPAD_FF) || defined(CONFIG_JOYSTICK_XPAD_LEDS)
static void xpad_irq_out(struct urb *urb) static void xpad_irq_out(struct urb *urb)
{ {
struct usb_xpad *xpad = urb->context;
int retval, status; int retval, status;
status = urb->status; status = urb->status;
...@@ -540,8 +542,9 @@ static void xpad_irq_out(struct urb *urb) ...@@ -540,8 +542,9 @@ static void xpad_irq_out(struct urb *urb)
exit: exit:
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
err("%s - usb_submit_urb failed with result %d", dev_err(&xpad->udev->dev,
__func__, retval); "%s - usb_submit_urb failed with result %d\n",
__func__, retval);
} }
static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad) static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment