summaryrefslogtreecommitdiffstats
path: root/arch/mips/cavium-octeon
diff options
context:
space:
mode:
authorAlexander Sverdlin <alexander.sverdlin@nokia.com>2018-07-13 11:51:56 -0400
committerPaul Burton <paul.burton@mips.com>2018-07-17 12:40:17 -0400
commit5c93316c8c2276323af2d98e9676efda7d055bee (patch)
tree44f48d7a8b8b371f6bea8a9764384a90e732b9de /arch/mips/cavium-octeon
parent4936084c2ee227524c242d790a9fbad7650320c7 (diff)
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/cavium-octeon')
-rw-r--r--arch/mips/cavium-octeon/setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index a8034d0dcade..6c437486af39 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -36,6 +36,7 @@
36#include <asm/mipsregs.h> 36#include <asm/mipsregs.h>
37#include <asm/bootinfo.h> 37#include <asm/bootinfo.h>
38#include <asm/sections.h> 38#include <asm/sections.h>
39#include <asm/setup.h>
39#include <asm/time.h> 40#include <asm/time.h>
40 41
41#include <asm/octeon/octeon.h> 42#include <asm/octeon/octeon.h>
@@ -1108,7 +1109,7 @@ void __init plat_mem_setup(void)
1108 * Emit one character to the boot UART. Exported for use by the 1109 * Emit one character to the boot UART. Exported for use by the
1109 * watchdog timer. 1110 * watchdog timer.
1110 */ 1111 */
1111int prom_putchar(char c) 1112void prom_putchar(char c)
1112{ 1113{
1113 uint64_t lsrval; 1114 uint64_t lsrval;
1114 1115
@@ -1119,7 +1120,6 @@ int prom_putchar(char c)
1119 1120
1120 /* Write the byte */ 1121 /* Write the byte */
1121 cvmx_write_csr(CVMX_MIO_UARTX_THR(octeon_uart), c & 0xffull); 1122 cvmx_write_csr(CVMX_MIO_UARTX_THR(octeon_uart), c & 0xffull);
1122 return 1;
1123} 1123}
1124EXPORT_SYMBOL(prom_putchar); 1124EXPORT_SYMBOL(prom_putchar);
1125 1125