From a538cf04ef67861a208075a6d57d0f045822e1d6 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Fri, 10 Oct 2014 17:41:17 -0700 Subject: power/reset: at91-poweroff: Fix error handling and other compiler warnings at91_poweroff_get_wakeup_mode can return a negative error code and should therefore not return an enum type. Similar, its result should not be assigned to an enum type. Otherwise, the returned value is never negative, resulting in a compiler warning and a missed error condition, which in turn results in writing bad values into a chip register. Also fix other compiler warnings which can be easily avoided. drivers/power/reset/at91-poweroff.c:74:24: warning: type qualifiers ignored on function return type drivers/power/reset/at91-poweroff.c:74:24: warning: no previous prototype for 'at91_poweroff_get_wakeup_mode' drivers/power/reset/at91-poweroff.c:83:16: warning: comparison between signed and unsigned integer expressions drivers/power/reset/at91-poweroff.c:97:2: warning: comparison of unsigned expression < 0 is always false Cc: Maxime Ripard Cc: Nicolas Ferre Signed-off-by: Guenter Roeck Acked-by: Maxime Ripard Signed-off-by: Sebastian Reichel --- drivers/power/reset/at91-poweroff.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'drivers/power/reset') diff --git a/drivers/power/reset/at91-poweroff.c b/drivers/power/reset/at91-poweroff.c index c61000333bb9..4b72ea51c364 100644 --- a/drivers/power/reset/at91-poweroff.c +++ b/drivers/power/reset/at91-poweroff.c @@ -71,10 +71,11 @@ static void at91_poweroff(void) writel(AT91_SHDW_KEY | AT91_SHDW_SHDW, at91_shdwc_base + AT91_SHDW_CR); } -const enum wakeup_type at91_poweroff_get_wakeup_mode(struct device_node *np) +static int at91_poweroff_get_wakeup_mode(struct device_node *np) { const char *pm; - int err, i; + unsigned int i; + int err; err = of_property_read_string(np, "atmel,wakeup-mode", &pm); if (err < 0) @@ -90,7 +91,7 @@ const enum wakeup_type at91_poweroff_get_wakeup_mode(struct device_node *np) static void at91_poweroff_dt_set_wakeup_mode(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; - enum wakeup_type wakeup_mode; + int wakeup_mode; u32 mode = 0, tmp; wakeup_mode = at91_poweroff_get_wakeup_mode(np); -- cgit v1.2.3