Merge git://git.infradead.org/battery-2.6

[linux-2.6-omap-h63xx.git] / drivers / usb / serial / visor.c

diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 7d84a7647e81efeec0c025df2ecf783ade3b16aa..7ee087fed913fbeed34678caebbe15dc8a96567c 100644 (file)
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -46,7 +46,6 @@ static int  visor_probe               (struct usb_serial *serial, const struct usb_device_id
 static int  visor_calc_num_ports(struct usb_serial *serial);
 static void visor_shutdown     (struct usb_serial *serial);
 static int  visor_ioctl                (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg);
-static void visor_set_termios  (struct usb_serial_port *port, struct ktermios *old_termios);
 static void visor_write_bulk_callback  (struct urb *urb);
 static void visor_read_bulk_callback   (struct urb *urb);
 static void visor_read_int_callback    (struct urb *urb);
@@ -104,6 +103,8 @@ static struct usb_device_id id_table [] = {
                .driver_info = (kernel_ulong_t)&palm_os_4_probe },
        { USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_TJ25_ID),
                .driver_info = (kernel_ulong_t)&palm_os_4_probe },
+       { USB_DEVICE(ACER_VENDOR_ID, ACER_S10_ID),
+               .driver_info = (kernel_ulong_t)&palm_os_4_probe },
        { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SCH_I330_ID), 
                .driver_info = (kernel_ulong_t)&palm_os_4_probe },
        { USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SPH_I500_ID), 
@@ -201,7 +202,6 @@ static struct usb_serial_driver handspring_device = {
        .calc_num_ports =       visor_calc_num_ports,
        .shutdown =             visor_shutdown,
        .ioctl =                visor_ioctl,
-       .set_termios =          visor_set_termios,
        .write =                visor_write,
        .write_room =           visor_write_room,
        .chars_in_buffer =      visor_chars_in_buffer,
@@ -232,7 +232,6 @@ static struct usb_serial_driver clie_5_device = {
        .calc_num_ports =       visor_calc_num_ports,
        .shutdown =             visor_shutdown,
        .ioctl =                visor_ioctl,
-       .set_termios =          visor_set_termios,
        .write =                visor_write,
        .write_room =           visor_write_room,
        .chars_in_buffer =      visor_chars_in_buffer,
@@ -260,7 +259,6 @@ static struct usb_serial_driver clie_3_5_device = {
        .unthrottle =           visor_unthrottle,
        .attach =               clie_3_5_startup,
        .ioctl =                visor_ioctl,
-       .set_termios =          visor_set_termios,
        .write =                visor_write,
        .write_room =           visor_write_room,
        .chars_in_buffer =      visor_chars_in_buffer,
@@ -934,66 +932,6 @@ static int visor_ioctl (struct usb_serial_port *port, struct file * file, unsign
        return -ENOIOCTLCMD;
 }
 
-
-/* This function is all nice and good, but we don't change anything based on it :) */
-static void visor_set_termios (struct usb_serial_port *port, struct ktermios *old_termios)
-{
-       unsigned int cflag;
-
-       dbg("%s - port %d", __FUNCTION__, port->number);
-
-       if ((!port->tty) || (!port->tty->termios)) {
-               dbg("%s - no tty structures", __FUNCTION__);
-               return;
-       }
-
-       cflag = port->tty->termios->c_cflag;
-
-       /* get the byte size */
-       switch (cflag & CSIZE) {
-               case CS5:       dbg("%s - data bits = 5", __FUNCTION__);   break;
-               case CS6:       dbg("%s - data bits = 6", __FUNCTION__);   break;
-               case CS7:       dbg("%s - data bits = 7", __FUNCTION__);   break;
-               default:
-               case CS8:       dbg("%s - data bits = 8", __FUNCTION__);   break;
-       }
-       
-       /* determine the parity */
-       if (cflag & PARENB)
-               if (cflag & PARODD)
-                       dbg("%s - parity = odd", __FUNCTION__);
-               else
-                       dbg("%s - parity = even", __FUNCTION__);
-       else
-               dbg("%s - parity = none", __FUNCTION__);
-
-       /* figure out the stop bits requested */
-       if (cflag & CSTOPB)
-               dbg("%s - stop bits = 2", __FUNCTION__);
-       else
-               dbg("%s - stop bits = 1", __FUNCTION__);
-
-       
-       /* figure out the flow control settings */
-       if (cflag & CRTSCTS)
-               dbg("%s - RTS/CTS is enabled", __FUNCTION__);
-       else
-               dbg("%s - RTS/CTS is disabled", __FUNCTION__);
-       
-       /* determine software flow control */
-       if (I_IXOFF(port->tty))
-               dbg("%s - XON/XOFF is enabled, XON = %2x, XOFF = %2x",
-                   __FUNCTION__, START_CHAR(port->tty), STOP_CHAR(port->tty));
-       else
-               dbg("%s - XON/XOFF is disabled", __FUNCTION__);
-
-       /* get the baud rate wanted */
-       dbg("%s - baud rate = %d", __FUNCTION__, tty_get_baud_rate(port->tty));
-
-       return;
-}
-
-
 static int __init visor_init (void)
 {
        int i, retval;