Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/input/joystick/xpad.c

+7 −4
Original line number Diff line number Diff line
@@ -492,7 +492,8 @@ 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",

		dev_err(&xpad->udev->dev,

			"%s - usb_submit_urb failed with result %d\n",

			__func__, retval);

}
@@ -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,7 +542,8 @@ 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",

		dev_err(&xpad->udev->dev,

			"%s - usb_submit_urb failed with result %d\n",

			__func__, retval);

}