Merge tag 'tty-5.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull serial driver fix from Greg KH:
"This is a single serial driver fix for a build issue that showed up
due to changes that came in through the tty tree in 5.18-rc1 that were
missed previously. It resolves a build error with the mpc52xx_uart
driver.

It has been in linux-next this week with no reported problems"

* tag 'tty-5.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
tty: serial: mpc52xx_uart: make rx/tx hooks return unsigned, part II.

Changed files
+10 -10
drivers
tty
+10 -10
drivers/tty/serial/mpc52xx_uart.c
··· 436 436 out_be32(&FIFO_512x(port)->rximr, MPC512x_PSC_FIFO_ALARM); 437 437 } 438 438 439 - static int mpc512x_psc_raw_rx_rdy(struct uart_port *port) 439 + static unsigned int mpc512x_psc_raw_rx_rdy(struct uart_port *port) 440 440 { 441 441 return !(in_be32(&FIFO_512x(port)->rxsr) & MPC512x_PSC_FIFO_EMPTY); 442 442 } 443 443 444 - static int mpc512x_psc_raw_tx_rdy(struct uart_port *port) 444 + static unsigned int mpc512x_psc_raw_tx_rdy(struct uart_port *port) 445 445 { 446 446 return !(in_be32(&FIFO_512x(port)->txsr) & MPC512x_PSC_FIFO_FULL); 447 447 } 448 448 449 - static int mpc512x_psc_rx_rdy(struct uart_port *port) 449 + static unsigned int mpc512x_psc_rx_rdy(struct uart_port *port) 450 450 { 451 451 return in_be32(&FIFO_512x(port)->rxsr) 452 452 & in_be32(&FIFO_512x(port)->rximr) 453 453 & MPC512x_PSC_FIFO_ALARM; 454 454 } 455 455 456 - static int mpc512x_psc_tx_rdy(struct uart_port *port) 456 + static unsigned int mpc512x_psc_tx_rdy(struct uart_port *port) 457 457 { 458 458 return in_be32(&FIFO_512x(port)->txsr) 459 459 & in_be32(&FIFO_512x(port)->tximr) 460 460 & MPC512x_PSC_FIFO_ALARM; 461 461 } 462 462 463 - static int mpc512x_psc_tx_empty(struct uart_port *port) 463 + static unsigned int mpc512x_psc_tx_empty(struct uart_port *port) 464 464 { 465 465 return in_be32(&FIFO_512x(port)->txsr) 466 466 & MPC512x_PSC_FIFO_EMPTY; ··· 780 780 out_be32(&FIFO_5125(port)->rximr, MPC512x_PSC_FIFO_ALARM); 781 781 } 782 782 783 - static int mpc5125_psc_raw_rx_rdy(struct uart_port *port) 783 + static unsigned int mpc5125_psc_raw_rx_rdy(struct uart_port *port) 784 784 { 785 785 return !(in_be32(&FIFO_5125(port)->rxsr) & MPC512x_PSC_FIFO_EMPTY); 786 786 } 787 787 788 - static int mpc5125_psc_raw_tx_rdy(struct uart_port *port) 788 + static unsigned int mpc5125_psc_raw_tx_rdy(struct uart_port *port) 789 789 { 790 790 return !(in_be32(&FIFO_5125(port)->txsr) & MPC512x_PSC_FIFO_FULL); 791 791 } 792 792 793 - static int mpc5125_psc_rx_rdy(struct uart_port *port) 793 + static unsigned int mpc5125_psc_rx_rdy(struct uart_port *port) 794 794 { 795 795 return in_be32(&FIFO_5125(port)->rxsr) & 796 796 in_be32(&FIFO_5125(port)->rximr) & MPC512x_PSC_FIFO_ALARM; 797 797 } 798 798 799 - static int mpc5125_psc_tx_rdy(struct uart_port *port) 799 + static unsigned int mpc5125_psc_tx_rdy(struct uart_port *port) 800 800 { 801 801 return in_be32(&FIFO_5125(port)->txsr) & 802 802 in_be32(&FIFO_5125(port)->tximr) & MPC512x_PSC_FIFO_ALARM; 803 803 } 804 804 805 - static int mpc5125_psc_tx_empty(struct uart_port *port) 805 + static unsigned int mpc5125_psc_tx_empty(struct uart_port *port) 806 806 { 807 807 return in_be32(&FIFO_5125(port)->txsr) & MPC512x_PSC_FIFO_EMPTY; 808 808 }