leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tty: serial: mpc52xx_uart: make rx/tx hooks return unsigned

Browse Source 
All these return bitmasks, so it makes more sense to return unsigned --
this is what a reader and also all the callers expect.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220224111028.20917-2-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2022-02-24 12:10:24 +01:00 committed by Greg Kroah-Hartman
parent 5318f70da7
commit 18662a1d8f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/tty/serial/mpc52xx_uart.c
View File

@ -83,11 +83,11 @@ static irqreturn_t mpc5xxx_uart_process_int(struct uart_port *port);
struct psc_ops { struct psc_ops {
void (*fifo_init)(struct uart_port *port); void (*fifo_init)(struct uart_port *port);
int (*raw_rx_rdy)(struct uart_port *port); unsigned int (*raw_rx_rdy)(struct uart_port *port);
int (*raw_tx_rdy)(struct uart_port *port); unsigned int (*raw_tx_rdy)(struct uart_port *port);
int (*rx_rdy)(struct uart_port *port); unsigned int (*rx_rdy)(struct uart_port *port);
int (*tx_rdy)(struct uart_port *port); unsigned int (*tx_rdy)(struct uart_port *port);
int (*tx_empty)(struct uart_port *port); unsigned int (*tx_empty)(struct uart_port *port);
void (*stop_rx)(struct uart_port *port); void (*stop_rx)(struct uart_port *port);
void (*start_tx)(struct uart_port *port); void (*start_tx)(struct uart_port *port);
void (*stop_tx)(struct uart_port *port); void (*stop_tx)(struct uart_port *port);
@ -203,34 +203,34 @@ static void mpc52xx_psc_fifo_init(struct uart_port *port)
out_be16(&psc->mpc52xx_psc_imr, port->read_status_mask); out_be16(&psc->mpc52xx_psc_imr, port->read_status_mask);
} }
static int mpc52xx_psc_raw_rx_rdy(struct uart_port *port) static unsigned int mpc52xx_psc_raw_rx_rdy(struct uart_port *port)
{ {
return in_be16(&PSC(port)->mpc52xx_psc_status) return in_be16(&PSC(port)->mpc52xx_psc_status)
& MPC52xx_PSC_SR_RXRDY; & MPC52xx_PSC_SR_RXRDY;
} }
static int mpc52xx_psc_raw_tx_rdy(struct uart_port *port) static unsigned int mpc52xx_psc_raw_tx_rdy(struct uart_port *port)
{ {
return in_be16(&PSC(port)->mpc52xx_psc_status) return in_be16(&PSC(port)->mpc52xx_psc_status)
& MPC52xx_PSC_SR_TXRDY; & MPC52xx_PSC_SR_TXRDY;
} }
static int mpc52xx_psc_rx_rdy(struct uart_port *port) static unsigned int mpc52xx_psc_rx_rdy(struct uart_port *port)
{ {
return in_be16(&PSC(port)->mpc52xx_psc_isr) return in_be16(&PSC(port)->mpc52xx_psc_isr)
& port->read_status_mask & port->read_status_mask
& MPC52xx_PSC_IMR_RXRDY; & MPC52xx_PSC_IMR_RXRDY;
} }
static int mpc52xx_psc_tx_rdy(struct uart_port *port) static unsigned int mpc52xx_psc_tx_rdy(struct uart_port *port)
{ {
return in_be16(&PSC(port)->mpc52xx_psc_isr) return in_be16(&PSC(port)->mpc52xx_psc_isr)
& port->read_status_mask & port->read_status_mask
& MPC52xx_PSC_IMR_TXRDY; & MPC52xx_PSC_IMR_TXRDY;
} }
static int mpc52xx_psc_tx_empty(struct uart_port *port) static unsigned int mpc52xx_psc_tx_empty(struct uart_port *port)
{ {
u16 sts = in_be16(&PSC(port)->mpc52xx_psc_status); u16 sts = in_be16(&PSC(port)->mpc52xx_psc_status);
@ -1365,7 +1365,7 @@ static const struct uart_ops mpc52xx_uart_ops = {
/* Interrupt handling */ /* Interrupt handling */
/* ======================================================================== */ /* ======================================================================== */
static inline int static inline unsigned int
mpc52xx_uart_int_rx_chars(struct uart_port *port) mpc52xx_uart_int_rx_chars(struct uart_port *port)
{ {
struct tty_port *tport = &port->state->port; struct tty_port *tport = &port->state->port;