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

[linux-2.6] / drivers / usb / serial / keyspan.c

diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 857c5312555ab6d69229c19e6606acec466d433d..3df8a66c5c3cd7ea57449069fa651c3643815352 100644 (file)
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -445,7 +445,7 @@ static void usa26_indat_callback(struct urb *urb)
                return;
        }
 
-       port = (struct usb_serial_port *) urb->context;
+       port =  urb->context;
        tty = port->tty;
        if (tty && urb->actual_length) {
                /* 0x80 bit is error flag */
@@ -490,7 +490,7 @@ static void usa2x_outdat_callback(struct urb *urb)
        struct usb_serial_port *port;
        struct keyspan_port_private *p_priv;
 
-       port = (struct usb_serial_port *) urb->context;
+       port =  urb->context;
        p_priv = usb_get_serial_port_data(port);
        dbg ("%s - urb %d", __func__, urb == p_priv->out_urbs[1]);
 
@@ -509,7 +509,7 @@ static void usa26_outcont_callback(struct urb *urb)
        struct usb_serial_port *port;
        struct keyspan_port_private *p_priv;
 
-       port = (struct usb_serial_port *) urb->context;
+       port =  urb->context;
        p_priv = usb_get_serial_port_data(port);
 
        if (p_priv->resend_cont) {
@@ -528,7 +528,7 @@ static void usa26_instat_callback(struct urb *urb)
        int old_dcd_state, err;
        int status = urb->status;
 
-       serial = (struct usb_serial *) urb->context;
+       serial =  urb->context;
 
        if (status) {
                dbg("%s - nonzero status: %x", __func__, status);
@@ -599,7 +599,7 @@ static void usa28_indat_callback(struct urb *urb)
 
        dbg ("%s", __func__);
 
-       port = (struct usb_serial_port *) urb->context;
+       port =  urb->context;
        p_priv = usb_get_serial_port_data(port);
        data = urb->transfer_buffer;
 
@@ -613,7 +613,7 @@ static void usa28_indat_callback(struct urb *urb)
                        return;
                }
 
-               port = (struct usb_serial_port *) urb->context;
+               port =  urb->context;
                p_priv = usb_get_serial_port_data(port);
                data = urb->transfer_buffer;
 
@@ -647,7 +647,7 @@ static void usa28_outcont_callback(struct urb *urb)
        struct usb_serial_port *port;
        struct keyspan_port_private *p_priv;
 
-       port = (struct usb_serial_port *) urb->context;
+       port =  urb->context;
        p_priv = usb_get_serial_port_data(port);
 
        if (p_priv->resend_cont) {
@@ -667,7 +667,7 @@ static void usa28_instat_callback(struct urb *urb)
        int old_dcd_state;
        int status = urb->status;
 
-       serial = (struct usb_serial *) urb->context;
+       serial =  urb->context;
 
        if (status) {
                dbg("%s - nonzero status: %x", __func__, status);
@@ -733,7 +733,7 @@ static void usa49_glocont_callback(struct urb *urb)
 
        dbg ("%s", __func__);
 
-       serial = (struct usb_serial *) urb->context;
+       serial =  urb->context;
        for (i = 0; i < serial->num_ports; ++i) {
                port = serial->port[i];
                p_priv = usb_get_serial_port_data(port);
@@ -761,7 +761,7 @@ static void usa49_instat_callback(struct urb *urb)
 
        dbg ("%s", __func__);
 
-       serial = (struct usb_serial *) urb->context;
+       serial =  urb->context;
 
        if (status) {
                dbg("%s - nonzero status: %x", __func__, status);
@@ -836,7 +836,7 @@ static void usa49_indat_callback(struct urb *urb)
                return;
        }
 
-       port = (struct usb_serial_port *) urb->context;
+       port =  urb->context;
        tty = port->tty;
        if (tty && urb->actual_length) {
                /* 0x80 bit is error flag */
@@ -973,7 +973,7 @@ static void usa90_indat_callback(struct urb *urb)
                return;
        }
 
-       port = (struct usb_serial_port *) urb->context;
+       port =  urb->context;
        p_priv = usb_get_serial_port_data(port);
 
        tty = port->tty;
@@ -1037,7 +1037,7 @@ static void       usa90_instat_callback(struct urb *urb)
        int old_dcd_state, err;
        int status = urb->status;
 
-       serial = (struct usb_serial *) urb->context;
+       serial =  urb->context;
 
        if (status) {
                dbg("%s - nonzero status: %x", __func__, status);
@@ -1084,7 +1084,7 @@ static void       usa90_outcont_callback(struct urb *urb)
        struct usb_serial_port *port;
        struct keyspan_port_private *p_priv;
 
-       port = (struct usb_serial_port *) urb->context;
+       port =  urb->context;
        p_priv = usb_get_serial_port_data(port);
 
        if (p_priv->resend_cont) {
@@ -1187,6 +1187,7 @@ static int keyspan_write_room (struct usb_serial_port *port)
        p_priv = usb_get_serial_port_data(port);
        d_details = p_priv->device_details;
 
+       /* FIXME: locking */
        if (d_details->msg_format == msg_usa90)
                data_len = 64;
        else
@@ -1203,13 +1204,13 @@ static int keyspan_write_room (struct usb_serial_port *port)
                        if (this_urb->status != -EINPROGRESS)
                                return (data_len);
        }
-       return (0);
+       return 0;
 }
 
 
 static int keyspan_chars_in_buffer (struct usb_serial_port *port)
 {
-       return (0);
+       return 0;
 }
 
 
@@ -1289,7 +1290,7 @@ static int keyspan_open (struct usb_serial_port *port, struct file *filp)
        //mdelay(100);
        //keyspan_set_termios(port, NULL);
 
-       return (0);
+       return 0;
 }
 
 static inline void stop_urb(struct urb *urb)
@@ -2006,7 +2007,7 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial,
        }
 #endif
 
-       return (0);
+       return 0;
 }
 
 static int keyspan_usa28_send_setup(struct usb_serial *serial,
@@ -2131,7 +2132,7 @@ static int keyspan_usa28_send_setup(struct usb_serial *serial,
        }
 #endif
 
-       return (0);
+       return 0;
 }
 
 static int keyspan_usa49_send_setup(struct usb_serial *serial,
@@ -2317,7 +2318,7 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial,
        }
 #endif
 
-       return (0);
+       return 0;
 }
 
 static int keyspan_usa90_send_setup(struct usb_serial *serial,
@@ -2455,7 +2456,7 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial,
        if ((err = usb_submit_urb(this_urb, GFP_ATOMIC)) != 0) {
                dbg("%s - usb_submit_urb(setup) failed (%d)", __func__, err);
        }
-       return (0);
+       return 0;
 }
 
 static int keyspan_usa67_send_setup(struct usb_serial *serial,
@@ -2603,7 +2604,7 @@ static int keyspan_usa67_send_setup(struct usb_serial *serial,
        if (err != 0)
                dbg("%s - usb_submit_urb(setup) failed (%d)", __func__,
                                err);
-       return (0);
+       return 0;
 }
 
 static void keyspan_send_setup(struct usb_serial_port *port, int reset_port)
@@ -2696,7 +2697,7 @@ static int keyspan_startup (struct usb_serial *serial)
                                err);
        }
                        
-       return (0);
+       return 0;
 }
 
 static void keyspan_shutdown (struct usb_serial *serial)