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>

diff --git a/drivers/clocksource/timer-nps.c b/drivers/clocksource/timer-nps.c
index b4c8a023a2d44016789ece94a04332cb0fb90ce0..8da5e93b681041f6e1a26585f614b7c6b3b71a5c 100644 (file)
--- a/drivers/clocksource/timer-nps.c
+++ b/drivers/clocksource/timer-nps.c
@@ -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);