Commit a26b0d49 authored Nov 22, 2016 by Arnd Bergmann Committed by Vineet Gupta Nov 30, 2016

clocksource: nps: avoid maybe-uninitialized warning

We get a harmless false-positive warning with the newly added nps
clocksource driver:

drivers/clocksource/timer-nps.c: In function 'nps_setup_clocksource':
drivers/clocksource/timer-nps.c:102:6: error: 'nps_timer1_freq' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Gcc here fails to identify that IS_ERR() is only true if PTR_ERR()
has a nonzero value. Using PTR_ERR_OR_ZERO() to convert the result
first makes this obvious and shuts up the warning.

Fixes: 0ee4d9922df5 ("clocksource: Add clockevent support to NPS400 driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>

parent 60263dcd

drivers/clocksource/timer-nps.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -53,9 +53,10 @@ static int __init nps_get_timer_clk(struct device_node *node,
		int ret;

		*clk = of_clk_get(node, 0);
		if (IS_ERR(*clk)) {
		ret = PTR_ERR_OR_ZERO(*clk);
		if (ret) {
		pr_err("timer missing clk");
		return PTR_ERR(*clk);
		return ret;
		}

		ret = clk_prepare_enable(*clk);