On 01/17/2017 09:36 AM, Alexander Sverdlin wrote:
From: Alexander Sverdlin <alexander.sverdlin@xxxxxxx>
Correct the function return type.
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@xxxxxxxxx>
This will make it conflict with the declaration in
drivers/watchdog/octeon-wdt-main.c
*Iff* you also fix the watchdog site, you can add Acked-by: David Daney
<david.daney@xxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: David Daney <david.daney@xxxxxxxxxx>
Cc: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Cc: "Steven J. Hill" <steven.hill@xxxxxxxxxx>
Cc: linux-mips@xxxxxxxxxxxxxx
---
arch/mips/cavium-octeon/setup.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 9a2db1c013d9..bb613d3e5246 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -1095,7 +1095,7 @@ void __init plat_mem_setup(void)
* Emit one character to the boot UART. Exported for use by the
* watchdog timer.
*/
-int prom_putchar(char c)
+void prom_putchar(char c)
{
uint64_t lsrval;
@@ -1106,7 +1106,6 @@ int prom_putchar(char c)
/* Write the byte */
cvmx_write_csr(CVMX_MIO_UARTX_THR(octeon_uart), c & 0xffull);
- return 1;
}
EXPORT_SYMBOL(prom_putchar);
