xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: serial: cp210x: use tcflag_t to fix incompatible pointer type

Browse Source 
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>
This commit is contained in:
Geert Uytterhoeven
2016-11-21 13:19:31 +01:00
committed by Johan Hovold
parent 2fbd69c4e3
commit 009615ab7f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/serial/cp210x.c
View 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_close(struct usb_serial_port *);
static void cp210x_get_termios(struct tty_struct *, 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, 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 *, static void cp210x_change_speed(struct tty_struct *, struct usb_serial_port *,
struct ktermios *); struct ktermios *);
static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *, 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->termios.c_cflag, &baud);
tty_encode_baud_rate(tty, baud, baud); tty_encode_baud_rate(tty, baud, baud);
} else { } else {
unsigned int cflag; tcflag_t cflag;
cflag = 0; cflag = 0;
cp210x_get_termios_port(port, &cflag, &baud); 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. * 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, 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; struct device *dev = &port->dev;
unsigned int cflag; tcflag_t cflag;
struct cp210x_flow_ctl flow_ctl; struct cp210x_flow_ctl flow_ctl;
u32 baud; u32 baud;
u16 bits; u16 bits;