4.9-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Geert Uytterhoeven <ge...@linux-m68k.org>

commit 009615ab7fd4e43b82a38e4e6adc5e23c1ee567f upstream.

On sparc32, tcflag_t is unsigned long, unlike all other architectures:

    drivers/usb/serial/cp210x.c: In function 'cp210x_get_termios':
    drivers/usb/serial/cp210x.c:717:3: warning: passing argument 2 of 
'cp210x_get_termios_port' from incompatible pointer type
       cp210x_get_termios_port(tty->driver_data,
       ^
    drivers/usb/serial/cp210x.c:35:13: note: expected 'unsigned int *' but 
argument is of type 'tcflag_t *'
     static void cp210x_get_termios_port(struct usb_serial_port *port,
                 ^

Consistently use tcflag_t to fix this.

Signed-off-by: Geert Uytterhoeven <ge...@linux-m68k.org>
Signed-off-by: Johan Hovold <jo...@kernel.org>
Cc: Guenter Roeck <li...@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/usb/serial/cp210x.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -33,7 +33,7 @@ static int cp210x_open(struct tty_struct
 static void cp210x_close(struct usb_serial_port *);
 static void cp210x_get_termios(struct tty_struct *, struct usb_serial_port *);
 static void cp210x_get_termios_port(struct usb_serial_port *port,
-       unsigned int *cflagp, unsigned int *baudp);
+       tcflag_t *cflagp, unsigned int *baudp);
 static void cp210x_change_speed(struct tty_struct *, struct usb_serial_port *,
                                                        struct ktermios *);
 static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *,
@@ -728,7 +728,7 @@ static void cp210x_get_termios(struct tt
                        &tty->termios.c_cflag, &baud);
                tty_encode_baud_rate(tty, baud, baud);
        } else {
-               unsigned int cflag;
+               tcflag_t cflag;
                cflag = 0;
                cp210x_get_termios_port(port, &cflag, &baud);
        }
@@ -739,10 +739,10 @@ static void cp210x_get_termios(struct tt
  * This is the heart of cp210x_get_termios which always uses a 
&usb_serial_port.
  */
 static void cp210x_get_termios_port(struct usb_serial_port *port,
-       unsigned int *cflagp, unsigned int *baudp)
+       tcflag_t *cflagp, unsigned int *baudp)
 {
        struct device *dev = &port->dev;
-       unsigned int cflag;
+       tcflag_t cflag;
        struct cp210x_flow_ctl flow_ctl;
        u32 baud;
        u16 bits;


Reply via email to