Skip to content

Commit

Permalink
usb_serial: some coding style fixes
Browse files Browse the repository at this point in the history 
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
@Alan-Cox @gregkh
Alan-Cox authored and gregkh committed May 2, 2008
1 parent e5430f8 commit c4d0f8c
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 103 deletions.
98 changes: 50 additions & 48 deletions drivers/usb/serial/aircable.c
View file
Expand Up @@ -147,7 +147,7 @@ static void serial_buf_free(struct circ_buf *cb)
*/
static int serial_buf_data_avail(struct circ_buf *cb)
{
return CIRC_CNT(cb->head,cb->tail,AIRCABLE_BUF_SIZE);
return CIRC_CNT(cb->head, cb->tail, AIRCABLE_BUF_SIZE);
}

/*
Expand All @@ -171,7 +171,7 @@ static int serial_buf_put(struct circ_buf *cb, const char *buf, int count)
cb->head = (cb->head + c) & (AIRCABLE_BUF_SIZE-1);
buf += c;
count -= c;
ret= c;
ret = c;
}
return ret;
}
Expand All @@ -197,7 +197,7 @@ static int serial_buf_get(struct circ_buf *cb, char *buf, int count)
cb->tail = (cb->tail + c) & (AIRCABLE_BUF_SIZE-1);
buf += c;
count -= c;
ret= c;
ret = c;
}
return ret;
}
Expand All @@ -208,7 +208,7 @@ static void aircable_send(struct usb_serial_port *port)
{
int count, result;
struct aircable_private *priv = usb_get_serial_port_data(port);
unsigned char* buf;
unsigned char *buf;
__le16 *dbuf;
dbg("%s - port %d", __func__, port->number);
if (port->write_urb_busy)
Expand All @@ -229,7 +229,8 @@ static void aircable_send(struct usb_serial_port *port)
buf[1] = TX_HEADER_1;
dbuf = (__le16 *)&buf[2];
*dbuf = cpu_to_le16((u16)count);
serial_buf_get(priv->tx_buf,buf + HCI_HEADER_LENGTH, MAX_HCI_FRAMESIZE);
serial_buf_get(priv->tx_buf, buf + HCI_HEADER_LENGTH,
MAX_HCI_FRAMESIZE);

memcpy(port->write_urb->transfer_buffer, buf,
count + HCI_HEADER_LENGTH);
Expand Down Expand Up @@ -261,7 +262,7 @@ static void aircable_read(struct work_struct *work)
struct tty_struct *tty;
unsigned char *data;
int count;
if (priv->rx_flags & THROTTLED){
if (priv->rx_flags & THROTTLED) {
if (priv->rx_flags & ACTUALLY_THROTTLED)
schedule_work(&priv->rx_work);
return;
Expand All @@ -282,10 +283,10 @@ static void aircable_read(struct work_struct *work)
count = min(64, serial_buf_data_avail(priv->rx_buf));

if (count <= 0)
return; //We have finished sending everything.
return; /* We have finished sending everything. */

tty_prepare_flip_string(tty, &data, count);
if (!data){
if (!data) {
err("%s- kzalloc(%d) failed.", __func__, count);
return;
}
Expand All @@ -304,9 +305,10 @@ static void aircable_read(struct work_struct *work)
static int aircable_probe(struct usb_serial *serial,
const struct usb_device_id *id)
{
struct usb_host_interface *iface_desc = serial->interface->cur_altsetting;
struct usb_host_interface *iface_desc = serial->interface->
cur_altsetting;
struct usb_endpoint_descriptor *endpoint;
int num_bulk_out=0;
int num_bulk_out = 0;
int i;

for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) {
Expand All @@ -325,13 +327,13 @@ static int aircable_probe(struct usb_serial *serial,
return 0;
}

static int aircable_attach (struct usb_serial *serial)
static int aircable_attach(struct usb_serial *serial)
{
struct usb_serial_port *port = serial->port[0];
struct aircable_private *priv;

priv = kzalloc(sizeof(struct aircable_private), GFP_KERNEL);
if (!priv){
if (!priv) {
err("%s- kmalloc(%Zd) failed.", __func__,
sizeof(struct aircable_private));
return -ENOMEM;
Expand Down Expand Up @@ -392,7 +394,7 @@ static int aircable_write(struct usb_serial_port *port,

usb_serial_debug_data(debug, &port->dev, __func__, count, source);

if (!count){
if (!count) {
dbg("%s - write request of 0 bytes", __func__);
return count;
}
Expand All @@ -418,31 +420,31 @@ static void aircable_write_bulk_callback(struct urb *urb)

/* This has been taken from cypress_m8.c cypress_write_int_callback */
switch (status) {
case 0:
/* success */
break;
case -ECONNRESET:
case -ENOENT:
case -ESHUTDOWN:
/* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d",
__func__, status);
port->write_urb_busy = 0;
case 0:
/* success */
break;
case -ECONNRESET:
case -ENOENT:
case -ESHUTDOWN:
/* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d",
__func__, status);
port->write_urb_busy = 0;
return;
default:
/* error in the urb, so we have to resubmit it */
dbg("%s - Overflow in write", __func__);
dbg("%s - nonzero write bulk status received: %d",
__func__, 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",
__func__, result);
else
return;
default:
/* error in the urb, so we have to resubmit it */
dbg("%s - Overflow in write", __func__);
dbg("%s - nonzero write bulk status received: %d",
__func__, 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",
__func__, result);
else
return;
}

port->write_urb_busy = 0;
Expand Down Expand Up @@ -472,11 +474,11 @@ static void aircable_read_bulk_callback(struct urb *urb)
dbg("%s - caught -EPROTO, resubmitting the urb",
__func__);
usb_fill_bulk_urb(port->read_urb, port->serial->dev,
usb_rcvbulkpipe(port->serial->dev,
port->bulk_in_endpointAddress),
port->read_urb->transfer_buffer,
port->read_urb->transfer_buffer_length,
aircable_read_bulk_callback, port);
usb_rcvbulkpipe(port->serial->dev,
port->bulk_in_endpointAddress),
port->read_urb->transfer_buffer,
port->read_urb->transfer_buffer_length,
aircable_read_bulk_callback, port);

result = usb_submit_urb(urb, GFP_ATOMIC);
if (result)
Expand All @@ -490,7 +492,7 @@ static void aircable_read_bulk_callback(struct urb *urb)
}

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

tty = port->tty;
if (tty && urb->actual_length) {
Expand All @@ -507,9 +509,9 @@ static void aircable_read_bulk_callback(struct urb *urb)
no_packages = urb->actual_length / (HCI_COMPLETE_FRAME);

if (urb->actual_length % HCI_COMPLETE_FRAME != 0)
no_packages+=1;
no_packages++;

for (i = 0; i < no_packages ;i++) {
for (i = 0; i < no_packages; i++) {
if (remaining > (HCI_COMPLETE_FRAME))
package_length = HCI_COMPLETE_FRAME;
else
Expand All @@ -529,7 +531,7 @@ static void aircable_read_bulk_callback(struct urb *urb)
if (port->open_count) {
usb_fill_bulk_urb(port->read_urb, port->serial->dev,
usb_rcvbulkpipe(port->serial->dev,
port->bulk_in_endpointAddress),
port->bulk_in_endpointAddress),
port->read_urb->transfer_buffer,
port->read_urb->transfer_buffer_length,
aircable_read_bulk_callback, port);
Expand Down Expand Up @@ -602,7 +604,7 @@ static struct usb_serial_driver aircable_device = {
.unthrottle = aircable_unthrottle,
};

static int __init aircable_init (void)
static int __init aircable_init(void)
{
int retval;
retval = usb_serial_register(&aircable_device);
Expand All @@ -619,7 +621,7 @@ static int __init aircable_init (void)
return retval;
}

static void __exit aircable_exit (void)
static void __exit aircable_exit(void)
{
usb_deregister(&aircable_driver);
usb_serial_deregister(&aircable_device);
Expand Down
61 changes: 34 additions & 27 deletions drivers/usb/serial/airprime.c
View file
Expand Up @@ -68,8 +68,9 @@ static int airprime_send_setup(struct usb_serial_port *port)
val |= 0x02;

return usb_control_msg(serial->dev,
usb_rcvctrlpipe(serial->dev, 0),
0x22,0x21,val,0,NULL,0,USB_CTRL_SET_TIMEOUT);
usb_rcvctrlpipe(serial->dev, 0),
0x22, 0x21, val, 0, NULL, 0,
USB_CTRL_SET_TIMEOUT);
}

return 0;
Expand All @@ -90,17 +91,19 @@ static void airprime_read_bulk_callback(struct urb *urb)
__func__, status);
return;
}
usb_serial_debug_data(debug, &port->dev, __func__, urb->actual_length, data);
usb_serial_debug_data(debug, &port->dev, __func__,
urb->actual_length, data);

tty = port->tty;
if (tty && urb->actual_length) {
tty_insert_flip_string (tty, data, urb->actual_length);
tty_flip_buffer_push (tty);
tty_insert_flip_string(tty, data, urb->actual_length);
tty_flip_buffer_push(tty);
}

result = usb_submit_urb (urb, GFP_ATOMIC);
result = usb_submit_urb(urb, GFP_ATOMIC);
if (result)
dev_err(&port->dev, "%s - failed resubmitting read urb, error %d\n",
dev_err(&port->dev,
"%s - failed resubmitting read urb, error %d\n",
__func__, result);
return;
}
Expand All @@ -115,7 +118,7 @@ static void airprime_write_bulk_callback(struct urb *urb)
dbg("%s - port %d", __func__, port->number);

/* free up the transfer buffer, as usb_free_urb() does not do this */
kfree (urb->transfer_buffer);
kfree(urb->transfer_buffer);

if (status)
dbg("%s - nonzero write bulk status received: %d",
Expand Down Expand Up @@ -171,7 +174,7 @@ static int airprime_open(struct usb_serial_port *port, struct file *filp)
}
usb_fill_bulk_urb(urb, serial->dev,
usb_rcvbulkpipe(serial->dev,
port->bulk_out_endpointAddress),
port->bulk_out_endpointAddress),
buffer, buffer_size,
airprime_read_bulk_callback, port);
result = usb_submit_urb(urb, GFP_KERNEL);
Expand All @@ -183,7 +186,8 @@ static int airprime_open(struct usb_serial_port *port, struct file *filp)
__func__, i, port->number, result);
goto errout;
}
/* remember this urb so we can kill it when the port is closed */
/* remember this urb so we can kill it when the
port is closed */
priv->read_urbp[i] = urb;
}

Expand All @@ -192,22 +196,22 @@ static int airprime_open(struct usb_serial_port *port, struct file *filp)
goto out;

errout:
/* some error happened, cancel any submitted urbs and clean up anything that
got allocated successfully */
/* some error happened, cancel any submitted urbs and clean up
anything that got allocated successfully */

while (i-- != 0) {
urb = priv->read_urbp[i];
buffer = urb->transfer_buffer;
usb_kill_urb (urb);
usb_free_urb (urb);
kfree (buffer);
usb_kill_urb(urb);
usb_free_urb(urb);
kfree(buffer);
}

out:
return result;
}

static void airprime_close(struct usb_serial_port *port, struct file * filp)
static void airprime_close(struct usb_serial_port *port, struct file *filp)
{
struct airprime_private *priv = usb_get_serial_port_data(port);
int i;
Expand All @@ -223,13 +227,13 @@ static void airprime_close(struct usb_serial_port *port, struct file * filp)
mutex_unlock(&port->serial->disc_mutex);

for (i = 0; i < NUM_READ_URBS; ++i) {
usb_kill_urb (priv->read_urbp[i]);
kfree (priv->read_urbp[i]->transfer_buffer);
usb_free_urb (priv->read_urbp[i]);
usb_kill_urb(priv->read_urbp[i]);
kfree(priv->read_urbp[i]->transfer_buffer);
usb_free_urb(priv->read_urbp[i]);
}

/* free up private structure */
kfree (priv);
kfree(priv);
usb_set_serial_port_data(port, NULL);
}

Expand Down Expand Up @@ -259,10 +263,10 @@ static int airprime_write(struct usb_serial_port *port,
urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!urb) {
dev_err(&port->dev, "no more free urbs\n");
kfree (buffer);
kfree(buffer);
return -ENOMEM;
}
memcpy (buffer, buf, count);
memcpy(buffer, buf, count);

usb_serial_debug_data(debug, &port->dev, __func__, count, buffer);

Expand All @@ -279,15 +283,15 @@ static int airprime_write(struct usb_serial_port *port,
"%s - usb_submit_urb(write bulk) failed with status = %d\n",
__func__, status);
count = status;
kfree (buffer);
kfree(buffer);
} else {
spin_lock_irqsave(&priv->lock, flags);
++priv->outstanding_urbs;
spin_unlock_irqrestore(&priv->lock, flags);
}
/* we are done with this urb, so let the host driver
* really free it when it is finished with it */
usb_free_urb (urb);
usb_free_urb(urb);
return count;
}

Expand Down Expand Up @@ -315,8 +319,10 @@ static int __init airprime_init(void)
{
int retval;

airprime_device.num_ports =
(endpoints > 0 && endpoints <= MAX_BULK_EPS) ? endpoints : NUM_BULK_EPS;
airprime_device.num_ports = endpoints;
if (endpoints < 0 || endpoints >= MAX_BULK_EPS)
airprime_device.num_ports = NUM_BULK_EPS;

retval = usb_serial_register(&airprime_device);
if (retval)
return retval;
Expand All @@ -341,6 +347,7 @@ MODULE_LICENSE("GPL");
module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled");
module_param(buffer_size, int, 0);
MODULE_PARM_DESC(buffer_size, "Size of the transfer buffers in bytes (default 4096)");
MODULE_PARM_DESC(buffer_size,
"Size of the transfer buffers in bytes (default 4096)");
module_param(endpoints, int, 0);
MODULE_PARM_DESC(endpoints, "Number of bulk EPs to configure (default 3)");

0 comments on commit c4d0f8c

Please sign in to comment.