Commit d4260b51 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman

serial: Fix upstat_t sparse warnings

Commit 299245a1,
serial: core: Privatize modem status enable flags, introduced
the upstat_t type and matching bit definitions. The purpose is to
produce sparse warnings if the wrong bit definitions are used
(by warning of implicit integer conversions).

Fix implicit conversion to integer return type from uart_cts_enabled()
and uart_dcd_enabled().

Fixes the following sparse warnings:
drivers/tty/serial/serial_core.c:63:30: warning: incorrect type in return expression (different base types)
drivers/tty/serial/serial_core.c:63:30:    expected int
drivers/tty/serial/serial_core.c:63:30:    got restricted upstat_t
include/linux/serial_core.h:364:30: warning: incorrect type in return expression (different base types)
include/linux/serial_core.h:364:30:    expected bool
include/linux/serial_core.h:364:30:    got restricted upstat_t
include/linux/serial_core.h:364:30: warning: incorrect type in return expression (different base types)
include/linux/serial_core.h:364:30:    expected bool
include/linux/serial_core.h:364:30:    got restricted upstat_t
Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fda2b418
...@@ -61,7 +61,7 @@ static void uart_port_shutdown(struct tty_port *port); ...@@ -61,7 +61,7 @@ static void uart_port_shutdown(struct tty_port *port);
static int uart_dcd_enabled(struct uart_port *uport) static int uart_dcd_enabled(struct uart_port *uport)
{ {
return uport->status & UPSTAT_DCD_ENABLE; return !!(uport->status & UPSTAT_DCD_ENABLE);
} }
/* /*
......
...@@ -367,7 +367,7 @@ static inline int uart_tx_stopped(struct uart_port *port) ...@@ -367,7 +367,7 @@ static inline int uart_tx_stopped(struct uart_port *port)
static inline bool uart_cts_enabled(struct uart_port *uport) static inline bool uart_cts_enabled(struct uart_port *uport)
{ {
return uport->status & UPSTAT_CTS_ENABLE; return !!(uport->status & UPSTAT_CTS_ENABLE);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment