From 8c4dba1a5e5ff67380ae8d54fd5756e44dc2da59 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 16 Oct 2013 09:06:32 +0200 Subject: microblaze: Fix watchdog initialization The patch: "blackfin: Move blackfin watchdog driver out of the blackfin arch folder." (sha1: e9a389a18477c1c57a0b30e9ea8f4d38c6e26e63) changed hw_watchdog_init() prototype which didn't match with Microblaze one. This patch fixes the driver and Microblaze initialization. Signed-off-by: Michal Simek --- drivers/watchdog/xilinx_tb_wdt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/watchdog/xilinx_tb_wdt.c') diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c index 4e46e4cef7..6336c94883 100644 --- a/drivers/watchdog/xilinx_tb_wdt.c +++ b/drivers/watchdog/xilinx_tb_wdt.c @@ -54,7 +54,7 @@ static void hw_watchdog_isr(void *arg) hw_watchdog_reset(); } -int hw_watchdog_init(void) +void hw_watchdog_init(void) { int ret; @@ -65,7 +65,5 @@ int hw_watchdog_init(void) ret = install_interrupt_handler(CONFIG_WATCHDOG_IRQ, hw_watchdog_isr, NULL); if (ret) - return 1; - - return 0; + puts("Watchdog IRQ registration failed."); } -- cgit v1.2.3