MIPS: ath79: Remove one of the identical args in early_printk
Subsystems (2)
PATCH 1/1 MIPS: ath79: Remove one of the identical args in early_printk
prom_putchar_wait() inputs both mask and val but the callers always set them to the same value. Thus pass only val.
Suggested-by Jiri Slaby <[email protected]>
Signed-off-by Ilpo Järvinen <[email protected]>
---
This patch applies only to tty-next that has another change this work is based on.
arch/mips/ath79/early_printk.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
arch/mips/ath79/early_printk.c +6 -10
@@ -19,13 +19,13 @@static void (*_prom_putchar)(char ); -static inline void prom_putchar_wait (void __iomem *reg,u32 mask,u32 val) +static inline void prom_putchar_wait (void __iomem *reg,u32 val) {u32 t;do { t =__raw_readl (reg); -if ((t & mask) == val) +if ((t & val) == val)break ; }while (1 ); }
@@ -34,23 +34,19 @@ static void prom_putchar_ar71xx(char ch) {void __iomem *base = (void __iomem *)(KSEG1ADDR (AR71XX_UART_BASE )); -prom_putchar_wait (base +UART_LSR *4 ,UART_LSR_BOTH_EMPTY , -UART_LSR_BOTH_EMPTY ); +prom_putchar_wait (base +UART_LSR *4 ,UART_LSR_BOTH_EMPTY );__raw_writel ((unsigned char )ch, base +UART_TX *4 ); -prom_putchar_wait (base +UART_LSR *4 ,UART_LSR_BOTH_EMPTY , -UART_LSR_BOTH_EMPTY ); +prom_putchar_wait (base +UART_LSR *4 ,UART_LSR_BOTH_EMPTY ); }static void prom_putchar_ar933x (char ch) {void __iomem *base = (void __iomem *)(KSEG1ADDR (AR933X_UART_BASE )); -prom_putchar_wait (base +AR933X_UART_DATA_REG ,AR933X_UART_DATA_TX_CSR , -AR933X_UART_DATA_TX_CSR ); +prom_putchar_wait (base +AR933X_UART_DATA_REG ,AR933X_UART_DATA_TX_CSR );__raw_writel (AR933X_UART_DATA_TX_CSR | (unsigned char )ch, base +AR933X_UART_DATA_REG ); -prom_putchar_wait (base +AR933X_UART_DATA_REG ,AR933X_UART_DATA_TX_CSR , -AR933X_UART_DATA_TX_CSR ); +prom_putchar_wait (base +AR933X_UART_DATA_REG ,AR933X_UART_DATA_TX_CSR ); }static void prom_putchar_dummy (char ch)
Signature · 1 line
tg: (899e836bddb3..) cleanup/ath79-early-params (depends on: tty-next)