On Thu, Feb 24, 2022 at 12:10:24PM +0100, Jiri Slaby wrote:
> 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@xxxxxxx>
With this patch in place:
drivers/tty/serial/mpc52xx_uart.c:static unsigned int mpc52xx_psc_raw_tx_rdy(struct uart_port *port)
drivers/tty/serial/mpc52xx_uart.c:static int mpc512x_psc_raw_tx_rdy(struct uart_port *port)
^^^
drivers/tty/serial/mpc52xx_uart.c:static int mpc5125_psc_raw_tx_rdy(struct uart_port *port)
^^^
Same for other functions. This results in lots of compile errors.
Guenter
> ---
> drivers/tty/serial/mpc52xx_uart.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
> index 2704dc988e4a..8a6958377764 100644
> --- a/drivers/tty/serial/mpc52xx_uart.c
> +++ b/drivers/tty/serial/mpc52xx_uart.c
> @@ -83,11 +83,11 @@ static irqreturn_t mpc5xxx_uart_process_int(struct uart_port *port);
>
> struct psc_ops {
> void (*fifo_init)(struct uart_port *port);
> - int (*raw_rx_rdy)(struct uart_port *port);
> - int (*raw_tx_rdy)(struct uart_port *port);
> - int (*rx_rdy)(struct uart_port *port);
> - int (*tx_rdy)(struct uart_port *port);
> - int (*tx_empty)(struct uart_port *port);
> + unsigned int (*raw_rx_rdy)(struct uart_port *port);
> + unsigned int (*raw_tx_rdy)(struct uart_port *port);
> + unsigned int (*rx_rdy)(struct uart_port *port);
> + unsigned int (*tx_rdy)(struct uart_port *port);
> + unsigned int (*tx_empty)(struct uart_port *port);
> void (*stop_rx)(struct uart_port *port);
> void (*start_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);
> }
>
> -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)
> & 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)
> & 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)
> & port->read_status_mask
> & 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)
> & port->read_status_mask
> & 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);
>
> @@ -1365,7 +1365,7 @@ static const struct uart_ops mpc52xx_uart_ops = {
> /* Interrupt handling */
> /* ======================================================================== */
>
> -static inline int
> +static inline unsigned int
> mpc52xx_uart_int_rx_chars(struct uart_port *port)
> {
> struct tty_port *tport = &port->state->port;
> --
> 2.35.1
>
