Commit dbf3f093 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

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



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: 18662a1d (tty: serial: mpc52xx_uart: make rx/tx hooks return unsigned)
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220404055122.31194-1-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 31231092

drivers/tty/serial/mpc52xx_uart.c

+10 −10
Original line number Diff line number Diff line
@@ -436,31 +436,31 @@ static void mpc512x_psc_fifo_init(struct uart_port *port) 
	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);

}



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);

}



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)

	    & in_be32(&FIFO_512x(port)->rximr)

	    & 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)

	    & in_be32(&FIFO_512x(port)->tximr)

	    & 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)

	    & 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);

}



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);

}



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);

}



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) &

	       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) &

	       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;

}