]> git.karo-electronics.de Git - linux-beck.git/commitdiff
USB: serial: cp210x: use tcflag_t to fix incompatible pointer type
authorGeert Uytterhoeven <geert@linux-m68k.org>
Mon, 21 Nov 2016 12:19:31 +0000 (13:19 +0100)
committerJohan Hovold <johan@kernel.org>
Mon, 21 Nov 2016 14:19:01 +0000 (15:19 +0100)
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 <geert@linux-m68k.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
drivers/usb/serial/cp210x.c

index ef7f1c01c2cc4157986478fe43b6c9782611bca8..f2b3a8331789cc381541e8c719a310c5bc7f7bad 100644 (file)
@@ -36,7 +36,7 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *);
 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 *,
@@ -877,7 +877,7 @@ static void cp210x_get_termios(struct tty_struct *tty,
                        &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);
        }
@@ -888,10 +888,10 @@ static void cp210x_get_termios(struct tty_struct *tty,
  * 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;