linux-kernel - [PATCH -next] nios2: time: Fix build error and warning

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 17 Jun 2016 06:47:03 -0700
From:	Guenter Roeck <linux@...ck-us.net>
To:	Daniel Lezcano <daniel.lezcano@...aro.org>
Cc:	Ley Foon Tan <lftan@...era.com>, nios2-dev@...ts.rocketboards.org,
	linux-kernel@...r.kernel.org, Guenter Roeck <linux@...ck-us.net>
Subject: [PATCH -next] nios2: time: Fix build error and warning

nios2 builds fail with

arch/nios2/kernel/time.c: In function 'time_init':
arch/nios2/kernel/time.c:354:2: warning:
	'return' with a value, in function returning void

include/linux/of.h:999:2: warning:
	ISO C90 forbids mixed declarations and code

include/linux/of.h:999:22: error:
	expected declaration or statement at end of input

Fixes: 2ef9162920dc ("clocksource/drivers/nios2: Convert init function to return error")
Cc: Daniel Lezcano <daniel.lezcano@...aro.org>
Signed-off-by: Guenter Roeck <linux@...ck-us.net>
---
 arch/nios2/kernel/time.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/nios2/kernel/time.c b/arch/nios2/kernel/time.c
index f337eefdccbd..d9563ddb337e 100644
--- a/arch/nios2/kernel/time.c
+++ b/arch/nios2/kernel/time.c
@@ -346,12 +346,10 @@ void __init time_init(void)
 	for_each_compatible_node(np, NULL,  ALTR_TIMER_COMPATIBLE)
 		count++;
 
-	if (count < 2) {
+	if (count < 2)
 		panic("%d timer is found, it needs 2 timers in system\n", count);
 
 	clocksource_probe();
-
-	return 0;
 }
 
 CLOCKSOURCE_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init);
-- 
2.5.0