Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1421303 > unrolled thread

[PATCH] clocksource: nps: fix nps_timer_init return value

Back to article view | Back to linux.kernel

Contents

  [PATCH] clocksource: nps: fix nps_timer_init return value Arnd Bergmann <arnd@arndb.de> - 2016-06-13 22:50 +0200
    Re: [PATCH] clocksource: nps: fix nps_timer_init return value Daniel Lezcano <daniel.lezcano@linaro.org> - 2016-06-15 15:20 +0200

#1421303 — [PATCH] clocksource: nps: fix nps_timer_init return value

The CLOCKSOURCE_OF_DECLARE macro ensures that the type of the init
function matches the caller. In case of the new timer-nps driver,
it doesn't match, so we get a warning:

../drivers/clocksource/timer-nps.c:97:208: error: comparison of distinct pointer types lacks a cast [-Werror]
 CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clksrc, ezchip,nps400-timer,

This changes the return type to match what the caller expects.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/clocksource/timer-nps.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/timer-nps.c b/drivers/clocksource/timer-nps.c
index d46108920b2c..ae34718f5ab2 100644
--- a/drivers/clocksource/timer-nps.c
+++ b/drivers/clocksource/timer-nps.c
@@ -81,17 +81,19 @@ static void __init nps_setup_clocksource(struct device_node *node,
 	}
 }
 
-static void __init nps_timer_init(struct device_node *node)
+static int __init nps_timer_init(struct device_node *node)
 {
 	struct clk *clk;
 
 	clk = of_clk_get(node, 0);
 	if (IS_ERR(clk)) {
 		pr_err("Can't get timer clock.\n");
-		return;
+		return PTR_ERR(clk);
 	}
 
 	nps_setup_clocksource(node, clk);
+
+	return 0;
 }
 
 CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clksrc, "ezchip,nps400-timer",
-- 
2.7.0

[toc] | [next] | [standalone]

#1423003

On 06/13/2016 10:41 PM, Arnd Bergmann wrote:
> The CLOCKSOURCE_OF_DECLARE macro ensures that the type of the init
> function matches the caller. In case of the new timer-nps driver,
> it doesn't match, so we get a warning:
>
> ../drivers/clocksource/timer-nps.c:97:208: error: comparison of distinct pointer types lacks a cast [-Werror]
>   CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clksrc, ezchip,nps400-timer,
>
> This changes the return type to match what the caller expects.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---

Thanks, I integrated this change with the series.

   -- Daniel


-- 
  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web