diff options
author | Alexander Sverdlin <alexander.sverdlin@nokia.com> | 2018-07-13 17:51:56 +0200 |
---|---|---|
committer | Paul Burton <paul.burton@mips.com> | 2018-07-17 09:40:17 -0700 |
commit | 5c93316c8c2276323af2d98e9676efda7d055bee (patch) | |
tree | 44f48d7a8b8b371f6bea8a9764384a90e732b9de /arch/mips/ath25/early_printk.c | |
parent | 4936084c2ee227524c242d790a9fbad7650320c7 (diff) | |
download | linux-stable-5c93316c8c2276323af2d98e9676efda7d055bee.tar.gz linux-stable-5c93316c8c2276323af2d98e9676efda7d055bee.tar.bz2 linux-stable-5c93316c8c2276323af2d98e9676efda7d055bee.zip |
mips: unify prom_putchar() declarations
prom_putchar() is used centrally in early printk infrastructure therefore
at least MIPS should agree on the function return type.
[paul.burton@mips.com:
- Include linux/types.h in asm/setup.h to gain the bool typedef before
we start include asm/setup.h elsewhere.
- Include asm/setup.h in all files that use or define prom_putchar().
- Also standardise on signed rather than unsigned char argument.]
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/19842/
Cc: linux-mips@linux-mips.org
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: Jonas Gorski <jonas.gorski@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
Diffstat (limited to 'arch/mips/ath25/early_printk.c')
-rw-r--r-- | arch/mips/ath25/early_printk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/ath25/early_printk.c b/arch/mips/ath25/early_printk.c index 36035b628161..d534761e9cda 100644 --- a/arch/mips/ath25/early_printk.c +++ b/arch/mips/ath25/early_printk.c @@ -9,6 +9,7 @@ #include <linux/mm.h> #include <linux/io.h> #include <linux/serial_reg.h> +#include <asm/setup.h> #include "devices.h" #include "ar2315_regs.h" @@ -25,7 +26,7 @@ static inline unsigned char prom_uart_rr(void __iomem *base, unsigned reg) return __raw_readl(base + 4 * reg); } -void prom_putchar(unsigned char ch) +void prom_putchar(char ch) { static void __iomem *base; @@ -38,7 +39,7 @@ void prom_putchar(unsigned char ch) while ((prom_uart_rr(base, UART_LSR) & UART_LSR_THRE) == 0) ; - prom_uart_wr(base, UART_TX, ch); + prom_uart_wr(base, UART_TX, (unsigned char)ch); while ((prom_uart_rr(base, UART_LSR) & UART_LSR_THRE) == 0) ; } |