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

Commit 2a393f5f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: serial: io_edgeport: clean up urb->status usage 



This done in anticipation of removal of urb->status, which will make
that patch easier to review and apply in the future.


Cc: <linux-usb-devel@lists.sourceforge.net>
Cc: Al Borchers <alborchers@steinerpoint.com>
Cc: Peter Berger <pberger@brimson.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fbd27225

drivers/usb/serial/io_edgeport.c

+20 −11
Original line number Diff line number Diff line
@@ -599,10 +599,11 @@ static void edge_interrupt_callback (struct urb *urb) 
	int txCredits;

	int portNumber;

	int result;

	int status = urb->status;



	dbg("%s", __FUNCTION__);



	switch (urb->status) {

	switch (status) {

	case 0:

		/* success */

		break;
@@ -610,10 +611,12 @@ static void edge_interrupt_callback (struct urb *urb) 
	case -ENOENT:

	case -ESHUTDOWN:

		/* this urb is terminated, clean up */

		dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);

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

		    __FUNCTION__, status);

		return;

	default:

		dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);

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

		    __FUNCTION__, status);

		goto exit;

	}
@@ -688,13 +691,15 @@ static void edge_bulk_in_callback (struct urb *urb) 
{

	struct edgeport_serial	*edge_serial = (struct edgeport_serial *)urb->context;

	unsigned char		*data = urb->transfer_buffer;

	int			status;

	int			retval;

	__u16			raw_data_length;

	int status = urb->status;



	dbg("%s", __FUNCTION__);



	if (urb->status) {

		dbg("%s - nonzero read bulk status received: %d", __FUNCTION__, urb->status);

	if (status) {

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

		    __FUNCTION__, status);

		edge_serial->read_in_progress = false;

		return;

	}
@@ -722,9 +727,11 @@ static void edge_bulk_in_callback (struct urb *urb) 
	if (edge_serial->rxBytesAvail > 0) {

		dbg("%s - posting a read", __FUNCTION__);

		edge_serial->read_urb->dev = edge_serial->serial->dev;

		status = usb_submit_urb(edge_serial->read_urb, GFP_ATOMIC);

		if (status) {

			dev_err(&urb->dev->dev, "%s - usb_submit_urb(read bulk) failed, status = %d\n", __FUNCTION__, status);

		retval = usb_submit_urb(edge_serial->read_urb, GFP_ATOMIC);

		if (retval) {

			dev_err(&urb->dev->dev,

				"%s - usb_submit_urb(read bulk) failed, "

				"retval = %d\n", __FUNCTION__, retval);

			edge_serial->read_in_progress = false;

		}

	} else {
@@ -744,11 +751,13 @@ static void edge_bulk_out_data_callback (struct urb *urb) 
{

	struct edgeport_port *edge_port = (struct edgeport_port *)urb->context;

	struct tty_struct *tty;

	int status = urb->status;



	dbg("%s", __FUNCTION__);



	if (urb->status) {

		dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status);

	if (status) {

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

		    __FUNCTION__, status);

	}



	tty = edge_port->port->tty;