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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
185a85518a
commit
9cb757bfac
|
@ -492,8 +492,9 @@ static void xpad_irq_in(struct urb *urb)
|
|||
exit:
|
||||
retval = usb_submit_urb(urb, GFP_ATOMIC);
|
||||
if (retval)
|
||||
err ("%s - usb_submit_urb failed with result %d",
|
||||
__func__, retval);
|
||||
dev_err(&xpad->udev->dev,
|
||||
"%s - usb_submit_urb failed with result %d\n",
|
||||
__func__, retval);
|
||||
}
|
||||
|
||||
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)
|
||||
static void xpad_irq_out(struct urb *urb)
|
||||
{
|
||||
struct usb_xpad *xpad = urb->context;
|
||||
int retval, status;
|
||||
|
||||
status = urb->status;
|
||||
|
@ -540,8 +542,9 @@ static void xpad_irq_out(struct urb *urb)
|
|||
exit:
|
||||
retval = usb_submit_urb(urb, GFP_ATOMIC);
|
||||
if (retval)
|
||||
err("%s - usb_submit_urb failed with result %d",
|
||||
__func__, retval);
|
||||
dev_err(&xpad->udev->dev,
|
||||
"%s - usb_submit_urb failed with result %d\n",
|
||||
__func__, retval);
|
||||
}
|
||||
|
||||
static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
|
||||
|
|
Loading…
Reference in New Issue