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

Commit 6fc88f53 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

USB: convert away from urb->status in xpad driver 



USB is moving to transfering status as a parameter. To ease the transition
urb->status is to be touched only once in a function. The xpad driver has
been overlooked. Dmitry wants this to go through the USB tree.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0d22f655

drivers/input/joystick/xpad.c

+12 −8
Original line number Original line Diff line number Diff line
@@ -339,9 +339,11 @@ static void xpad360_process_packet(struct usb_xpad *xpad, 
static void xpad_irq_in(struct urb *urb)

static void xpad_irq_in(struct urb *urb)

{

{

	struct usb_xpad *xpad = urb->context;

	struct usb_xpad *xpad = urb->context;

	int retval;

	int retval, status;





	switch (urb->status) {

	status = urb->status;



	switch (status) {

	case 0:

	case 0:

		/* success */

		/* success */

		break;

		break;
@@ -350,11 +352,11 @@ static void xpad_irq_in(struct urb *urb) 
	case -ESHUTDOWN:

	case -ESHUTDOWN:

		/* this urb is terminated, clean up */

		/* this urb is terminated, clean up */

		dbg("%s - urb shutting down with status: %d",

		dbg("%s - urb shutting down with status: %d",

			__FUNCTION__, urb->status);

			__FUNCTION__, status);

		return;

		return;

	default:

	default:

		dbg("%s - nonzero urb status received: %d",

		dbg("%s - nonzero urb status received: %d",

			__FUNCTION__, urb->status);

			__FUNCTION__, status);

		goto exit;

		goto exit;

	}

	}
@@ -373,9 +375,11 @@ exit: 
#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)

{

{

	int retval;

	int retval, status;



	status = urb->status;





	switch (urb->status) {

	switch (status) {

		case 0:

		case 0:

		/* success */

		/* success */

		break;

		break;
@@ -384,11 +388,11 @@ static void xpad_irq_out(struct urb *urb) 
		case -ESHUTDOWN:

		case -ESHUTDOWN:

			/* this urb is terminated, clean up */

			/* this urb is terminated, clean up */

			dbg("%s - urb shutting down with status: %d",

			dbg("%s - urb shutting down with status: %d",

				__FUNCTION__, urb->status);

				__FUNCTION__, status);

			return;

			return;

		default:

		default:

			dbg("%s - nonzero urb status received: %d",

			dbg("%s - nonzero urb status received: %d",

				__FUNCTION__, urb->status);

				__FUNCTION__, status);

			goto exit;

			goto exit;

	}

	}