Skip to content

L
linux-davinci-2.6.23
Commit 964ee1de authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Greg Kroah-Hartman
Browse files
Options

USB: cleanup sierra wireless driver a bit 

This saves over 30 lines and fixes a warning from sparse and allows
debugging to work dynamically like all other usb-serial drivers.

Cc: Kevin Lloyd <linux@sierrawireless.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 033a3fb9
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 151 deletions
drivers/usb/serial/sierra.c
View file @ 964ee1de
...@@ -29,30 +29,6 @@ ...@@ -29,30 +29,6 @@
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/usb/serial.h> #include <linux/usb/serial.h>
/* Function prototypes */
static int sierra_open(struct usb_serial_port *port, struct file *filp);
static void sierra_close(struct usb_serial_port *port, struct file *filp);
static int sierra_startup(struct usb_serial *serial);
static void sierra_shutdown(struct usb_serial *serial);
static void sierra_rx_throttle(struct usb_serial_port *port);
static void sierra_rx_unthrottle(struct usb_serial_port *port);
static int sierra_write_room(struct usb_serial_port *port);
static void sierra_instat_callback(struct urb *urb);
static int sierra_write(struct usb_serial_port *port,
const unsigned char *buf, int count);
static int sierra_chars_in_buffer(struct usb_serial_port *port);
static int sierra_ioctl(struct usb_serial_port *port, struct file *file,
unsigned int cmd, unsigned long arg);
static void sierra_set_termios(struct usb_serial_port *port,
struct termios *old);
static void sierra_break_ctl(struct usb_serial_port *port, int break_state);
static int sierra_tiocmget(struct usb_serial_port *port, struct file *file);
static int sierra_tiocmset(struct usb_serial_port *port, struct file *file,
unsigned int set, unsigned int clear);
static int sierra_send_setup(struct usb_serial_port *port);
static struct usb_device_id id_table [] = { static struct usb_device_id id_table [] = {
{ USB_DEVICE(0x1199, 0x0018) }, /* Sierra Wireless MC5720 */ { USB_DEVICE(0x1199, 0x0018) }, /* Sierra Wireless MC5720 */
...@@ -68,6 +44,7 @@ static struct usb_device_id id_table [] = { ...@@ -68,6 +44,7 @@ static struct usb_device_id id_table [] = {
{ USB_DEVICE(0x0F3D, 0x0112) }, /* AirPrime/Sierra PC 5220 */ { USB_DEVICE(0x0F3D, 0x0112) }, /* AirPrime/Sierra PC 5220 */
{ } { }
}; };
MODULE_DEVICE_TABLE(usb, id_table);
static struct usb_device_id id_table_1port [] = { static struct usb_device_id id_table_1port [] = {
{ USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */ { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */
...@@ -87,88 +64,22 @@ static struct usb_device_id id_table_3port [] = { ...@@ -87,88 +64,22 @@ static struct usb_device_id id_table_3port [] = {
{ } { }
}; };
MODULE_DEVICE_TABLE(usb, id_table);
static struct usb_driver sierra_driver = { static struct usb_driver sierra_driver = {
.name = "sierra", .name = "sierra",
.probe = usb_serial_probe, .probe = usb_serial_probe,
.disconnect = usb_serial_disconnect, .disconnect = usb_serial_disconnect,
.id_table = id_table, .id_table = id_table,
.no_dynamic_id = 3, .no_dynamic_id = 1,
}; };
//static struct usb_serial_driver *sierra_device;
static struct usb_serial_driver sierra_1port_device = {
.driver = {
.owner = THIS_MODULE,
.name = "sierra1",
},
.description = "Sierra USB modem (1 port)",
.id_table = id_table_1port,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1,
.open = sierra_open,
.close = sierra_close,
.write = sierra_write,
.write_room = sierra_write_room,
.chars_in_buffer = sierra_chars_in_buffer,
.throttle = sierra_rx_throttle,
.unthrottle = sierra_rx_unthrottle,
.ioctl = sierra_ioctl,
.set_termios = sierra_set_termios,
.break_ctl = sierra_break_ctl,
.tiocmget = sierra_tiocmget,
.tiocmset = sierra_tiocmset,
.attach = sierra_startup,
.shutdown = sierra_shutdown,
.read_int_callback = sierra_instat_callback,
};
static struct usb_serial_driver sierra_3port_device = {
.driver = {
.owner = THIS_MODULE,
.name = "sierra3",
},
.description = "Sierra USB modem (3 port)",
.id_table = id_table_3port,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = 3,
.num_bulk_out = 3,
.num_ports = 3,
.open = sierra_open,
.close = sierra_close,
.write = sierra_write,
.write_room = sierra_write_room,
.chars_in_buffer = sierra_chars_in_buffer,
.throttle = sierra_rx_throttle,
.unthrottle = sierra_rx_unthrottle,
.ioctl = sierra_ioctl,
.set_termios = sierra_set_termios,
.break_ctl = sierra_break_ctl,
.tiocmget = sierra_tiocmget,
.tiocmset = sierra_tiocmset,
.attach = sierra_startup,
.shutdown = sierra_shutdown,
.read_int_callback = sierra_instat_callback,
};
#ifdef CONFIG_USB_DEBUG
static int debug; static int debug;
#else
#define debug 0
#endif
/* per port private data */ /* per port private data */
#define N_IN_URB 4
#define N_IN_URB 4 #define N_OUT_URB 1
#define N_OUT_URB 1 #define IN_BUFLEN 4096
#define IN_BUFLEN 4096 #define OUT_BUFLEN 128
#define OUT_BUFLEN 128
struct sierra_port_private { struct sierra_port_private {
/* Input endpoints and buffer for this port */ /* Input endpoints and buffer for this port */
...@@ -189,44 +100,30 @@ struct sierra_port_private { ...@@ -189,44 +100,30 @@ struct sierra_port_private {
unsigned long tx_start_time[N_OUT_URB]; unsigned long tx_start_time[N_OUT_URB];
}; };
/* Functions used by new usb-serial code. */ static int sierra_send_setup(struct usb_serial_port *port)
static int __init sierra_init(void)
{ {
int retval; struct usb_serial *serial = port->serial;
retval = usb_serial_register(&sierra_1port_device); struct sierra_port_private *portdata;
if (retval)
goto failed_1port_device_register;
retval = usb_serial_register(&sierra_3port_device);
if (retval)
goto failed_3port_device_register;
retval = usb_register(&sierra_driver); dbg("%s", __FUNCTION__);
if (retval)
goto failed_driver_register;
info(DRIVER_DESC ": " DRIVER_VERSION); portdata = usb_get_serial_port_data(port);
return 0; if (port->tty) {
int val = 0;
if (portdata->dtr_state)
val |= 0x01;
if (portdata->rts_state)
val |= 0x02;
failed_driver_register: return usb_control_msg(serial->dev,
usb_serial_deregister(&sierra_3port_device); usb_rcvctrlpipe(serial->dev, 0),
failed_3port_device_register: 0x22,0x21,val,0,NULL,0,USB_CTRL_SET_TIMEOUT);
usb_serial_deregister(&sierra_1port_device); }
failed_1port_device_register:
return retval;
}
static void __exit sierra_exit(void) return 0;
{
usb_deregister (&sierra_driver);
usb_serial_deregister(&sierra_1port_device);
usb_serial_deregister(&sierra_3port_device);
} }
module_init(sierra_init);
module_exit(sierra_exit);
static void sierra_rx_throttle(struct usb_serial_port *port) static void sierra_rx_throttle(struct usb_serial_port *port)
{ {
dbg("%s", __FUNCTION__); dbg("%s", __FUNCTION__);
...@@ -578,8 +475,8 @@ static void sierra_close(struct usb_serial_port *port, struct file *filp) ...@@ -578,8 +475,8 @@ static void sierra_close(struct usb_serial_port *port, struct file *filp)
/* Helper functions used by sierra_setup_urbs */ /* Helper functions used by sierra_setup_urbs */
static struct urb *sierra_setup_urb(struct usb_serial *serial, int endpoint, static struct urb *sierra_setup_urb(struct usb_serial *serial, int endpoint,
int dir, void *ctx, char *buf, int len, int dir, void *ctx, char *buf, int len,
void (*callback)(struct urb *)) usb_complete_t callback)
{ {
struct urb *urb; struct urb *urb;
...@@ -629,30 +526,6 @@ static void sierra_setup_urbs(struct usb_serial *serial) ...@@ -629,30 +526,6 @@ static void sierra_setup_urbs(struct usb_serial *serial)
} }
} }
static int sierra_send_setup(struct usb_serial_port *port)
{
struct usb_serial *serial = port->serial;
struct sierra_port_private *portdata;
dbg("%s", __FUNCTION__);
portdata = usb_get_serial_port_data(port);
if (port->tty) {
int val = 0;
if (portdata->dtr_state)
val |= 0x01;
if (portdata->rts_state)
val |= 0x02;
return usb_control_msg(serial->dev,
usb_rcvctrlpipe(serial->dev, 0),
0x22,0x21,val,0,NULL,0,USB_CTRL_SET_TIMEOUT);
}
return 0;
}
static int sierra_startup(struct usb_serial *serial) static int sierra_startup(struct usb_serial *serial)
{ {
int i, err; int i, err;
...@@ -730,6 +603,100 @@ static void sierra_shutdown(struct usb_serial *serial) ...@@ -730,6 +603,100 @@ static void sierra_shutdown(struct usb_serial *serial)
} }
} }
static struct usb_serial_driver sierra_1port_device = {
.driver = {
.owner = THIS_MODULE,
.name = "sierra1",
},
.description = "Sierra USB modem (1 port)",
.id_table = id_table_1port,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1,
.open = sierra_open,
.close = sierra_close,
.write = sierra_write,
.write_room = sierra_write_room,
.chars_in_buffer = sierra_chars_in_buffer,
.throttle = sierra_rx_throttle,
.unthrottle = sierra_rx_unthrottle,
.ioctl = sierra_ioctl,
.set_termios = sierra_set_termios,
.break_ctl = sierra_break_ctl,
.tiocmget = sierra_tiocmget,
.tiocmset = sierra_tiocmset,
.attach = sierra_startup,
.shutdown = sierra_shutdown,
.read_int_callback = sierra_instat_callback,
};
static struct usb_serial_driver sierra_3port_device = {
.driver = {
.owner = THIS_MODULE,
.name = "sierra3",
},
.description = "Sierra USB modem (3 port)",
.id_table = id_table_3port,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = 3,
.num_bulk_out = 3,
.num_ports = 3,
.open = sierra_open,
.close = sierra_close,
.write = sierra_write,
.write_room = sierra_write_room,
.chars_in_buffer = sierra_chars_in_buffer,
.throttle = sierra_rx_throttle,
.unthrottle = sierra_rx_unthrottle,
.ioctl = sierra_ioctl,
.set_termios = sierra_set_termios,
.break_ctl = sierra_break_ctl,
.tiocmget = sierra_tiocmget,
.tiocmset = sierra_tiocmset,
.attach = sierra_startup,
.shutdown = sierra_shutdown,
.read_int_callback = sierra_instat_callback,
};
/* Functions used by new usb-serial code. */
static int __init sierra_init(void)
{
int retval;
retval = usb_serial_register(&sierra_1port_device);
if (retval)
goto failed_1port_device_register;
retval = usb_serial_register(&sierra_3port_device);
if (retval)
goto failed_3port_device_register;
retval = usb_register(&sierra_driver);
if (retval)
goto failed_driver_register;
info(DRIVER_DESC ": " DRIVER_VERSION);
return 0;
failed_driver_register:
usb_serial_deregister(&sierra_3port_device);
failed_3port_device_register:
usb_serial_deregister(&sierra_1port_device);
failed_1port_device_register:
return retval;
}
static void __exit sierra_exit(void)
{
usb_deregister (&sierra_driver);
usb_serial_deregister(&sierra_1port_device);
usb_serial_deregister(&sierra_3port_device);
}
module_init(sierra_init);
module_exit(sierra_exit);
MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC); MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_VERSION(DRIVER_VERSION); MODULE_VERSION(DRIVER_VERSION);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment