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

Commit 372db8a7 authored by Thiago Galesi's avatar Thiago Galesi Committed by Greg Kroah-Hartman
Browse files

USB: pl2303: remove 80-columns limit violations in pl2303 driver 



Fixes several lines that overrun 80 columns in Prolific pl2303 driver
and cleans up some space usages in the function calls.

Signed-off-by: default avatarThiago Galesi <thiagogalesi@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a009b75a

drivers/usb/serial/pl2303.c

+123 −129
Original line number Diff line number Diff line
@@ -258,7 +258,8 @@ static int set_control_lines (struct usb_device *dev, u8 value) 
	return retval;

}



static int pl2303_write (struct usb_serial_port *port,  const unsigned char *buf, int count)

static int pl2303_write(struct usb_serial_port *port, const unsigned char *buf,

			int count)

{

	struct pl2303_private *priv = usb_get_serial_port_data(port);

	unsigned long flags;
@@ -304,13 +305,15 @@ static void pl2303_send(struct usb_serial_port *port) 


	spin_unlock_irqrestore(&priv->lock, flags);



	usb_serial_debug_data(debug, &port->dev, __FUNCTION__, count, port->write_urb->transfer_buffer);

	usb_serial_debug_data(debug, &port->dev, __FUNCTION__, count,

			      port->write_urb->transfer_buffer);



	port->write_urb->transfer_buffer_length = count;

	port->write_urb->dev = port->serial->dev;

	result = usb_submit_urb(port->write_urb, GFP_ATOMIC);

	if (result) {

		dev_err(&port->dev, "%s - failed submitting write urb, error %d\n", __FUNCTION__, result);

		dev_err(&port->dev, "%s - failed submitting write urb,"

			" error %d\n", __FUNCTION__, result);

		priv->write_urb_in_use = 0;

		// TODO: reschedule pl2303_send

	}
@@ -350,7 +353,8 @@ static int pl2303_chars_in_buffer(struct usb_serial_port *port) 
	return chars;

}



static void pl2303_set_termios (struct usb_serial_port *port, struct termios *old_termios)

static void pl2303_set_termios(struct usb_serial_port *port,

			       struct termios *old_termios)

{

	struct usb_serial *serial = port->serial;

	struct pl2303_private *priv = usb_get_serial_port_data(port);
@@ -371,7 +375,8 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol 
	spin_lock_irqsave(&priv->lock, flags);

	if (!priv->termios_initialized) {

		*(port->tty->termios) = tty_std_termios;

		port->tty->termios->c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;

		port->tty->termios->c_cflag = B9600 | CS8 | CREAD |

					      HUPCL | CLOCAL;

		priv->termios_initialized = 1;

	}

	spin_unlock_irqrestore(&priv->lock, flags);
@@ -380,7 +385,8 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol 
	/* check that they really want us to change something */

	if (old_termios) {

		if ((cflag == old_termios->c_cflag) &&

		    (RELEVANT_IFLAG(port->tty->termios->c_iflag) == RELEVANT_IFLAG(old_termios->c_iflag))) {

		    (RELEVANT_IFLAG(port->tty->termios->c_iflag) ==

		     RELEVANT_IFLAG(old_termios->c_iflag))) {

			dbg("%s - nothing to change...", __FUNCTION__);

			return;

		}
@@ -398,7 +404,6 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol 
	dbg("0xa1:0x21:0:0  %d - %x %x %x %x %x %x %x", i,

	    buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);





	if (cflag & CSIZE) {

		switch (cflag & CSIZE) {

			case CS5:	buf[6] = 5;	break;
@@ -429,7 +434,8 @@ static void pl2303_set_termios (struct usb_serial_port *port, struct termios *ol 
		case B230400:	baud = 230400;	break;

		case B460800:	baud = 460800;	break;

		default:

			dev_err(&port->dev, "pl2303 driver does not support the baudrate requested (fix it)\n");

			dev_err(&port->dev, "pl2303 driver does not support"

				" the baudrate requested (fix it)\n");

			break;

	}

	dbg("%s - baud = %d", __FUNCTION__, baud);
@@ -577,7 +583,8 @@ static int pl2303_open (struct usb_serial_port *port, struct file *filp) 
	port->read_urb->dev = serial->dev;

	result = usb_submit_urb(port->read_urb, GFP_KERNEL);

	if (result) {

		dev_err(&port->dev, "%s - failed submitting read urb, error %d\n", __FUNCTION__, result);

		dev_err(&port->dev, "%s - failed submitting read urb,"

			" error %d\n", __FUNCTION__, result);

		pl2303_close(port, NULL);

		return -EPROTO;

	}
@@ -586,14 +593,14 @@ static int pl2303_open (struct usb_serial_port *port, struct file *filp) 
	port->interrupt_in_urb->dev = serial->dev;

	result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);

	if (result) {

		dev_err(&port->dev, "%s - failed submitting interrupt urb, error %d\n", __FUNCTION__, result);

		dev_err(&port->dev, "%s - failed submitting interrupt urb,"

			" error %d\n", __FUNCTION__, result);

		pl2303_close(port, NULL);

		return -EPROTO;

	}

	return 0;

}





static void pl2303_close(struct usb_serial_port *port, struct file *filp)

{

	struct pl2303_private *priv = usb_get_serial_port_data(port);
@@ -612,9 +619,9 @@ static void pl2303_close (struct usb_serial_port *port, struct file *filp) 
	add_wait_queue(&port->tty->write_wait, &wait);

	for (;;) {

		set_current_state(TASK_INTERRUPTIBLE);

		if (pl2303_buf_data_avail(priv->buf) == 0

		|| timeout == 0 || signal_pending(current)

		|| !usb_get_intfdata(port->serial->interface))	/* disconnect */

		if (pl2303_buf_data_avail(priv->buf) == 0 ||

		    timeout == 0 || signal_pending(current) ||

		    !usb_get_intfdata(port->serial->interface))	/* disconnect */

			break;

		spin_unlock_irqrestore(&priv->lock, flags);

		timeout = schedule_timeout(timeout);
@@ -749,7 +756,8 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) 
	return 0;

}



static int pl2303_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg)

static int pl2303_ioctl(struct usb_serial_port *port, struct file *file,

			unsigned int cmd, unsigned long arg)

{

	dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd);
@@ -787,7 +795,6 @@ static void pl2303_break_ctl (struct usb_serial_port *port, int break_state) 
		dbg("%s - error sending break = %d", __FUNCTION__, result);

}





static void pl2303_shutdown(struct usb_serial *serial)

{

	int i;
@@ -850,24 +857,28 @@ static void pl2303_read_int_callback (struct urb *urb, struct pt_regs *regs) 
	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__,

		    urb->status);

		return;

	default:

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

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

		    urb->status);

		goto exit;

	}



	usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, urb->transfer_buffer);

	usb_serial_debug_data(debug, &port->dev, __FUNCTION__,

			      urb->actual_length, urb->transfer_buffer);



	pl2303_update_line_status(port, data, actual_length);



exit:

	status = usb_submit_urb(urb, GFP_ATOMIC);

	if (status)

		dev_err(&urb->dev->dev, "%s - usb_submit_urb failed with result %d\n",

		dev_err(&urb->dev->dev,

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

			__FUNCTION__, status);

}





static void pl2303_read_bulk_callback(struct urb *urb, struct pt_regs *regs)

{

	struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
@@ -889,20 +900,25 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs) 
			return;

		}

		if (urb->status == -EPROTO) {

			/* PL2303 mysteriously fails with -EPROTO reschedule the read */

			dbg("%s - caught -EPROTO, resubmitting the urb", __FUNCTION__);

			/* PL2303 mysteriously fails with -EPROTO reschedule

			 * the read */

			dbg("%s - caught -EPROTO, resubmitting the urb",

			    __FUNCTION__);

			urb->status = 0;

			urb->dev = port->serial->dev;

			result = usb_submit_urb(urb, GFP_ATOMIC);

			if (result)

				dev_err(&urb->dev->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result);

				dev_err(&urb->dev->dev, "%s - failed"

					" resubmitting read urb, error %d\n",

					__FUNCTION__, result);

			return;

		}

		dbg("%s - unable to handle the error, exiting.", __FUNCTION__);

		return;

	}



	usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data);

	usb_serial_debug_data(debug, &port->dev, __FUNCTION__,

			      urb->actual_length, data);



	/* get tty_flag from status */

	tty_flag = TTY_NORMAL;
@@ -939,14 +955,13 @@ static void pl2303_read_bulk_callback (struct urb *urb, struct pt_regs *regs) 
		urb->dev = port->serial->dev;

		result = usb_submit_urb(urb, GFP_ATOMIC);

		if (result)

			dev_err(&urb->dev->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result);

			dev_err(&urb->dev->dev, "%s - failed resubmitting"

				" read urb, error %d\n", __FUNCTION__, result);

	}



	return;

}







static void pl2303_write_bulk_callback(struct urb *urb, struct pt_regs *regs)

{

	struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
@@ -963,18 +978,21 @@ static void pl2303_write_bulk_callback (struct urb *urb, struct pt_regs *regs) 
	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__,

		    urb->status);

		priv->write_urb_in_use = 0;

		return;

	default:

		/* error in the urb, so we have to resubmit it */

		dbg("%s - Overflow in write", __FUNCTION__);

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

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

		    urb->status);

		port->write_urb->transfer_buffer_length = 1;

		port->write_urb->dev = port->serial->dev;

		result = usb_submit_urb(port->write_urb, GFP_ATOMIC);

		if (result)

			dev_err(&urb->dev->dev, "%s - failed resubmitting write urb, error %d\n", __FUNCTION__, result);

			dev_err(&urb->dev->dev, "%s - failed resubmitting write"

				" urb, error %d\n", __FUNCTION__, result);

		else

			return;

	}
@@ -985,19 +1003,15 @@ static void pl2303_write_bulk_callback (struct urb *urb, struct pt_regs *regs) 
	pl2303_send(port);

}





/*

 * pl2303_buf_alloc

 *

 * Allocate a circular buffer and all associated memory.

 */



static struct pl2303_buf *pl2303_buf_alloc(unsigned int size)

{



	struct pl2303_buf *pb;





	if (size == 0)

		return NULL;
@@ -1015,16 +1029,13 @@ static struct pl2303_buf *pl2303_buf_alloc(unsigned int size) 
	pb->buf_get = pb->buf_put = pb->buf_buf;



	return pb;



}





/*

 * pl2303_buf_free

 *

 * Free the buffer and all associated memory.

 */



static void pl2303_buf_free(struct pl2303_buf *pb)

{

	if (pb) {
@@ -1033,13 +1044,11 @@ static void pl2303_buf_free(struct pl2303_buf *pb) 
	}

}





/*

 * pl2303_buf_clear

 *

 * Clear out all data in the circular buffer.

 */



static void pl2303_buf_clear(struct pl2303_buf *pb)

{

	if (pb != NULL)
@@ -1047,14 +1056,12 @@ static void pl2303_buf_clear(struct pl2303_buf *pb) 
		/* equivalent to a get of all data available */

}





/*

 * pl2303_buf_data_avail

 *

 * Return the number of bytes of data available in the circular

 * buffer.

 */



static unsigned int pl2303_buf_data_avail(struct pl2303_buf *pb)

{

	if (pb != NULL)
@@ -1063,14 +1070,12 @@ static unsigned int pl2303_buf_data_avail(struct pl2303_buf *pb) 
		return 0;

}





/*

 * pl2303_buf_space_avail

 *

 * Return the number of bytes of space available in the circular

 * buffer.

 */



static unsigned int pl2303_buf_space_avail(struct pl2303_buf *pb)

{

	if (pb != NULL)
@@ -1079,7 +1084,6 @@ static unsigned int pl2303_buf_space_avail(struct pl2303_buf *pb) 
		return 0;

}





/*

 * pl2303_buf_put

 *
@@ -1088,14 +1092,11 @@ static unsigned int pl2303_buf_space_avail(struct pl2303_buf *pb) 
 *

 * Return the number of bytes copied.

 */



static unsigned int pl2303_buf_put(struct pl2303_buf *pb, const char *buf,

				   unsigned int count)

{



	unsigned int len;





	if (pb == NULL)

		return 0;
@@ -1120,10 +1121,8 @@ static unsigned int pl2303_buf_put(struct pl2303_buf *pb, const char *buf, 
	}



	return count;



}





/*

 * pl2303_buf_get

 *
@@ -1132,14 +1131,11 @@ static unsigned int pl2303_buf_put(struct pl2303_buf *pb, const char *buf, 
 *

 * Return the number of bytes copied.

 */



static unsigned int pl2303_buf_get(struct pl2303_buf *pb, char *buf,

				   unsigned int count)

{



	unsigned int len;





	if (pb == NULL)

		return 0;
@@ -1164,12 +1160,12 @@ static unsigned int pl2303_buf_get(struct pl2303_buf *pb, char *buf, 
	}



	return count;



}



static int __init pl2303_init(void)

{

	int retval;



	retval = usb_serial_register(&pl2303_device);

	if (retval)

		goto failed_usb_serial_register;
@@ -1184,14 +1180,12 @@ static int __init pl2303_init (void) 
	return retval;

}





static void __exit pl2303_exit(void)

{

	usb_deregister(&pl2303_driver);

	usb_serial_deregister(&pl2303_device);

}





module_init(pl2303_init);

module_exit(pl2303_exit);