From: Michal Simek <michal.simek@xilinx.com>
Date: Tue, 15 Nov 2016 10:53:54 +0000 (+0100)
Subject: microblaze: Fix return value from xilinx_timer_init
X-Git-Tag: v4.10-rc1~41^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=63b7c83ebea06d23dfd1548391515614b5765ad8;p=karo-tx-linux.git

microblaze: Fix return value from xilinx_timer_init

The patch
"clocksource/drivers/microblaze: Convert init function to return error"
(sha1: 0586421746ef2bc33898d2d7f3dbb0eec6b234c3)
introduced return value and this one was forgetten to convert.

This patch also remove compilation warning:
arch/microblaze/kernel/timer.c: In function 'xilinx_timer_init':
arch/microblaze/kernel/timer.c:262:3: warning: 'return' with no value,
 in function returning non-void [-Wreturn-type]

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---

diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index 5bbf38b916ef..9e954959f605 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -259,7 +259,7 @@ static int __init xilinx_timer_init(struct device_node *timer)
 	int ret;
 
 	if (initialized)
-		return;
+		return -EINVAL;
 
 	initialized = 1;