malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tty-usb-option: Coding style

Browse Source 
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox 2008-07-22 11:15:45 +01:00 committed by Linus Torvalds
parent 2a77c81449
commit 19e58fae0c
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
drivers/usb/serial/option.c
View File

@ -43,8 +43,10 @@
#include <linux/usb/serial.h> #include <linux/usb/serial.h>
/* Function prototypes */ /* Function prototypes */
static int option_open(struct tty_struct *tty, struct usb_serial_port *port, struct file *filp); static int option_open(struct tty_struct *tty, struct usb_serial_port *port,
static void option_close(struct tty_struct *tty, struct usb_serial_port *port, struct file *filp); struct file *filp);
static void option_close(struct tty_struct *tty, struct usb_serial_port *port,
struct file *filp);
static int option_startup(struct usb_serial *serial); static int option_startup(struct usb_serial *serial);
static void option_shutdown(struct usb_serial *serial); static void option_shutdown(struct usb_serial *serial);
static int option_write_room(struct tty_struct *tty); static int option_write_room(struct tty_struct *tty);
@ -393,15 +395,15 @@ static int __init option_init(void)
return 0; return 0;
failed_driver_register: failed_driver_register:
usb_serial_deregister (&option_1port_device); usb_serial_deregister(&option_1port_device);
failed_1port_device_register: failed_1port_device_register:
return retval; return retval;
} }
static void __exit option_exit(void) static void __exit option_exit(void)
{ {
usb_deregister (&option_driver); usb_deregister(&option_driver);
usb_serial_deregister (&option_1port_device); usb_serial_deregister(&option_1port_device);
} }
module_init(option_init); module_init(option_init);
@ -471,7 +473,7 @@ static int option_write(struct tty_struct *tty, struct usb_serial_port *port,
i = 0; i = 0;
left = count; left = count;
for (i=0; left > 0 && i < N_OUT_URB; i++) { for (i = 0; left > 0 && i < N_OUT_URB; i++) {
todo = left; todo = left;
if (todo > OUT_BUFLEN) if (todo > OUT_BUFLEN)
todo = OUT_BUFLEN; todo = OUT_BUFLEN;
@ -492,7 +494,7 @@ static int option_write(struct tty_struct *tty, struct usb_serial_port *port,
usb_pipeendpoint(this_urb->pipe), i); usb_pipeendpoint(this_urb->pipe), i);
/* send the data */ /* send the data */
memcpy (this_urb->transfer_buffer, buf, todo); memcpy(this_urb->transfer_buffer, buf, todo);
this_urb->transfer_buffer_length = todo; this_urb->transfer_buffer_length = todo;
this_urb->dev = port->serial->dev; this_urb->dev = port->serial->dev;
@ -583,7 +585,7 @@ static void option_instat_callback(struct urb *urb)
struct usb_serial *serial = port->serial; struct usb_serial *serial = port->serial;
dbg("%s", __func__); dbg("%s", __func__);
dbg("%s: urb %p port %p has data %p", __func__,urb,port,portdata); dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);
if (status == 0) { if (status == 0) {
struct usb_ctrlrequest *req_pkt = struct usb_ctrlrequest *req_pkt =
@ -613,7 +615,7 @@ static void option_instat_callback(struct urb *urb)
tty_hangup(port->port.tty); tty_hangup(port->port.tty);
} else { } else {
dbg("%s: type %x req %x", __func__, dbg("%s: type %x req %x", __func__,
req_pkt->bRequestType,req_pkt->bRequest); req_pkt->bRequestType, req_pkt->bRequest);
} }
} else } else
dbg("%s: error %d", __func__, status); dbg("%s: error %d", __func__, status);
@ -639,7 +641,7 @@ static int option_write_room(struct tty_struct *tty)
portdata = usb_get_serial_port_data(port); portdata = usb_get_serial_port_data(port);
for (i=0; i < N_OUT_URB; i++) { for (i = 0; i < N_OUT_URB; i++) {
this_urb = portdata->out_urbs[i]; this_urb = portdata->out_urbs[i];
if (this_urb && !test_bit(i, &portdata->out_busy)) if (this_urb && !test_bit(i, &portdata->out_busy))
data_len += OUT_BUFLEN; data_len += OUT_BUFLEN;
@ -659,7 +661,7 @@ static int option_chars_in_buffer(struct tty_struct *tty)
portdata = usb_get_serial_port_data(port); portdata = usb_get_serial_port_data(port);
for (i=0; i < N_OUT_URB; i++) { for (i = 0; i < N_OUT_URB; i++) {
this_urb = portdata->out_urbs[i]; this_urb = portdata->out_urbs[i];
/* FIXME: This locking is insufficient as this_urb may /* FIXME: This locking is insufficient as this_urb may
go unused during the test */ go unused during the test */
@ -689,7 +691,7 @@ static int option_open(struct tty_struct *tty,
/* Reset low level data toggle and start reading from endpoints */ /* Reset low level data toggle and start reading from endpoints */
for (i = 0; i < N_IN_URB; i++) { for (i = 0; i < N_IN_URB; i++) {
urb = portdata->in_urbs[i]; urb = portdata->in_urbs[i];
if (! urb) if (!urb)
continue; continue;
if (urb->dev != serial->dev) { if (urb->dev != serial->dev) {
dbg("%s: dev %p != %p", __func__, dbg("%s: dev %p != %p", __func__,
@ -714,7 +716,7 @@ static int option_open(struct tty_struct *tty,
/* Reset low level data toggle on out endpoints */ /* Reset low level data toggle on out endpoints */
for (i = 0; i < N_OUT_URB; i++) { for (i = 0; i < N_OUT_URB; i++) {
urb = portdata->out_urbs[i]; urb = portdata->out_urbs[i];
if (! urb) if (!urb)
continue; continue;
urb->dev = serial->dev; urb->dev = serial->dev;
/* usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe), /* usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe),
@ -726,7 +728,7 @@ static int option_open(struct tty_struct *tty,
option_send_setup(tty, port); option_send_setup(tty, port);
return (0); return 0;
} }
static void option_close(struct tty_struct *tty, static void option_close(struct tty_struct *tty,
@ -784,7 +786,7 @@ static struct urb *option_setup_urb(struct usb_serial *serial, int endpoint,
/* Setup urbs */ /* Setup urbs */
static void option_setup_urbs(struct usb_serial *serial) static void option_setup_urbs(struct usb_serial *serial)
{ {
int i,j; int i, j;
struct usb_serial_port *port; struct usb_serial_port *port;
struct option_port_private *portdata; struct option_port_private *portdata;
@ -794,18 +796,22 @@ static void option_setup_urbs(struct usb_serial *serial)
port = serial->port[i]; port = serial->port[i];
portdata = usb_get_serial_port_data(port); portdata = usb_get_serial_port_data(port);
/* Do indat endpoints first */ /* Do indat endpoints first */
for (j = 0; j < N_IN_URB; ++j) { for (j = 0; j < N_IN_URB; ++j) {
portdata->in_urbs[j] = option_setup_urb (serial, portdata->in_urbs[j] = option_setup_urb(serial,
port->bulk_in_endpointAddress, USB_DIR_IN, port, port->bulk_in_endpointAddress,
portdata->in_buffer[j], IN_BUFLEN, option_indat_callback); USB_DIR_IN, port,
portdata->in_buffer[j],
IN_BUFLEN, option_indat_callback);
} }
/* outdat endpoints */ /* outdat endpoints */
for (j = 0; j < N_OUT_URB; ++j) { for (j = 0; j < N_OUT_URB; ++j) {
portdata->out_urbs[j] = option_setup_urb (serial, portdata->out_urbs[j] = option_setup_urb(serial,
port->bulk_out_endpointAddress, USB_DIR_OUT, port, port->bulk_out_endpointAddress,
portdata->out_buffer[j], OUT_BUFLEN, option_outdat_callback); USB_DIR_OUT, port,
portdata->out_buffer[j],
OUT_BUFLEN, option_outdat_callback);
} }
} }
} }
@ -834,8 +840,8 @@ static int option_send_setup(struct tty_struct *tty,
val |= 0x02; val |= 0x02;
return usb_control_msg(serial->dev, return usb_control_msg(serial->dev,
usb_rcvctrlpipe(serial->dev, 0), usb_rcvctrlpipe(serial->dev, 0),
0x22,0x21,val,ifNum,NULL,0,USB_CTRL_SET_TIMEOUT); 0x22, 0x21, val, ifNum, NULL, 0, USB_CTRL_SET_TIMEOUT);
} }
return 0; return 0;
} }
@ -856,7 +862,7 @@ static int option_startup(struct usb_serial *serial)
if (!portdata) { if (!portdata) {
dbg("%s: kmalloc for option_port_private (%d) failed!.", dbg("%s: kmalloc for option_port_private (%d) failed!.",
__func__, i); __func__, i);
return (1); return 1;
} }
for (j = 0; j < N_IN_URB; j++) { for (j = 0; j < N_IN_URB; j++) {
@ -875,17 +881,15 @@ static int option_startup(struct usb_serial *serial)
usb_set_serial_port_data(port, portdata); usb_set_serial_port_data(port, portdata);
if (! port->interrupt_in_urb) if (!port->interrupt_in_urb)
continue; continue;
err = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); err = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
if (err) if (err)
dbg("%s: submit irq_in urb failed %d", dbg("%s: submit irq_in urb failed %d",
__func__, err); __func__, err);
} }
option_setup_urbs(serial); option_setup_urbs(serial);
return 0;
return (0);
bail_out_error2: bail_out_error2:
for (j = 0; j < N_OUT_URB; j++) for (j = 0; j < N_OUT_URB; j++)
@ -924,7 +928,8 @@ static void option_shutdown(struct usb_serial *serial)
for (j = 0; j < N_IN_URB; j++) { for (j = 0; j < N_IN_URB; j++) {
if (portdata->in_urbs[j]) { if (portdata->in_urbs[j]) {
usb_free_urb(portdata->in_urbs[j]); usb_free_urb(portdata->in_urbs[j]);
free_page((unsigned long)portdata->in_buffer[j]); free_page((unsigned long)
portdata->in_buffer[j]);
portdata->in_urbs[j] = NULL; portdata->in_urbs[j] = NULL;
} }
} }