Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

tty: serial: mpc52xx_uart: make rx/tx hooks return unsigned, part II.

Browse Source 
The below commit changed types of some hooks in struct psc_ops. It also
changed the types of the functions which are referenced in the instances
of the above struct.

However the commit did so only for CONFIG_PPC_MPC52xx, but not for
CONFIG_PPC_MPC512x. This results in build errors like:
  mpc52xx_uart.c:static unsigned int mpc52xx_psc_raw_tx_rdy(struct uart_port *port)
  mpc52xx_uart.c:static int mpc512x_psc_raw_tx_rdy(struct uart_port *port)
                        ^^^
  mpc52xx_uart.c:static int mpc5125_psc_raw_tx_rdy(struct uart_port *port)
                        ^^^

Therefore, fix the latter case now too.

Fixes: 18662a1d8f (tty: serial: mpc52xx_uart: make rx/tx hooks return unsigned)
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220404055122.31194-1-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2022-04-04 07:51:22 +02:00 committed by Greg Kroah-Hartman
parent 3123109284
commit dbf3f09322
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -436,31 +436,31 @@ static void mpc512x_psc_fifo_init(struct uart_port *port)
out_be32(&FIFO_512x(port)->rximr, MPC512x_PSC_FIFO_ALARM); out_be32(&FIFO_512x(port)->rximr, MPC512x_PSC_FIFO_ALARM);
} }
static int mpc512x_psc_raw_rx_rdy(struct uart_port *port) static unsigned int mpc512x_psc_raw_rx_rdy(struct uart_port *port)
{ {
return !(in_be32(&FIFO_512x(port)->rxsr) & MPC512x_PSC_FIFO_EMPTY); return !(in_be32(&FIFO_512x(port)->rxsr) & MPC512x_PSC_FIFO_EMPTY);
} }
static int mpc512x_psc_raw_tx_rdy(struct uart_port *port) static unsigned int mpc512x_psc_raw_tx_rdy(struct uart_port *port)
{ {
return !(in_be32(&FIFO_512x(port)->txsr) & MPC512x_PSC_FIFO_FULL); return !(in_be32(&FIFO_512x(port)->txsr) & MPC512x_PSC_FIFO_FULL);
} }
static int mpc512x_psc_rx_rdy(struct uart_port *port) static unsigned int mpc512x_psc_rx_rdy(struct uart_port *port)
{ {
return in_be32(&FIFO_512x(port)->rxsr) return in_be32(&FIFO_512x(port)->rxsr)
& in_be32(&FIFO_512x(port)->rximr) & in_be32(&FIFO_512x(port)->rximr)
& MPC512x_PSC_FIFO_ALARM; & MPC512x_PSC_FIFO_ALARM;
} }
static int mpc512x_psc_tx_rdy(struct uart_port *port) static unsigned int mpc512x_psc_tx_rdy(struct uart_port *port)
{ {
return in_be32(&FIFO_512x(port)->txsr) return in_be32(&FIFO_512x(port)->txsr)
& in_be32(&FIFO_512x(port)->tximr) & in_be32(&FIFO_512x(port)->tximr)
& MPC512x_PSC_FIFO_ALARM; & MPC512x_PSC_FIFO_ALARM;
} }
static int mpc512x_psc_tx_empty(struct uart_port *port) static unsigned int mpc512x_psc_tx_empty(struct uart_port *port)
{ {
return in_be32(&FIFO_512x(port)->txsr) return in_be32(&FIFO_512x(port)->txsr)
& MPC512x_PSC_FIFO_EMPTY; & MPC512x_PSC_FIFO_EMPTY;
@ -780,29 +780,29 @@ static void mpc5125_psc_fifo_init(struct uart_port *port)
out_be32(&FIFO_5125(port)->rximr, MPC512x_PSC_FIFO_ALARM); out_be32(&FIFO_5125(port)->rximr, MPC512x_PSC_FIFO_ALARM);
} }
static int mpc5125_psc_raw_rx_rdy(struct uart_port *port) static unsigned int mpc5125_psc_raw_rx_rdy(struct uart_port *port)
{ {
return !(in_be32(&FIFO_5125(port)->rxsr) & MPC512x_PSC_FIFO_EMPTY); return !(in_be32(&FIFO_5125(port)->rxsr) & MPC512x_PSC_FIFO_EMPTY);
} }
static int mpc5125_psc_raw_tx_rdy(struct uart_port *port) static unsigned int mpc5125_psc_raw_tx_rdy(struct uart_port *port)
{ {
return !(in_be32(&FIFO_5125(port)->txsr) & MPC512x_PSC_FIFO_FULL); return !(in_be32(&FIFO_5125(port)->txsr) & MPC512x_PSC_FIFO_FULL);
} }
static int mpc5125_psc_rx_rdy(struct uart_port *port) static unsigned int mpc5125_psc_rx_rdy(struct uart_port *port)
{ {
return in_be32(&FIFO_5125(port)->rxsr) & return in_be32(&FIFO_5125(port)->rxsr) &
in_be32(&FIFO_5125(port)->rximr) & MPC512x_PSC_FIFO_ALARM; in_be32(&FIFO_5125(port)->rximr) & MPC512x_PSC_FIFO_ALARM;
} }
static int mpc5125_psc_tx_rdy(struct uart_port *port) static unsigned int mpc5125_psc_tx_rdy(struct uart_port *port)
{ {
return in_be32(&FIFO_5125(port)->txsr) & return in_be32(&FIFO_5125(port)->txsr) &
in_be32(&FIFO_5125(port)->tximr) & MPC512x_PSC_FIFO_ALARM; in_be32(&FIFO_5125(port)->tximr) & MPC512x_PSC_FIFO_ALARM;
} }
static int mpc5125_psc_tx_empty(struct uart_port *port) static unsigned int mpc5125_psc_tx_empty(struct uart_port *port)
{ {
return in_be32(&FIFO_5125(port)->txsr) & MPC512x_PSC_FIFO_EMPTY; return in_be32(&FIFO_5125(port)->txsr) & MPC512x_PSC_FIFO_EMPTY;
} }