Patchwork rtc: stmp3xxx: fix warning for unselected watchdog

login
register
mail settings
Submitter Steffen Trumtrar
Date March 5, 2013, 8:40 a.m.
Message ID <1362472837-31925-1-git-send-email-s.trumtrar@pengutronix.de>
Download mbox | patch
Permalink /patch/224959/
State New
Headers show

Comments

Steffen Trumtrar - March 5, 2013, 8:40 a.m.
The patch
	rtc: stmp3xxx: add wdt-accessor function
introduces a warning and a note if the watchdog is not enabled.
This is because of an incompatible pointer in the function
declaration.
Fix the function declaration.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: Alessandro Zummo <alessandro.zummo@towertech.it>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 drivers/rtc/rtc-stmp3xxx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Steffen Trumtrar - March 5, 2013, 12:58 p.m.
On Tue, Mar 05, 2013 at 09:40:37AM +0100, Steffen Trumtrar wrote:
> The patch
> 	rtc: stmp3xxx: add wdt-accessor function
> introduces a warning and a note if the watchdog is not enabled.
> This is because of an incompatible pointer in the function
> declaration.
> Fix the function declaration.
> 
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Cc: Alessandro Zummo <alessandro.zummo@towertech.it>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
>  drivers/rtc/rtc-stmp3xxx.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
> index 33a8264..d2cc0c3 100644
> --- a/drivers/rtc/rtc-stmp3xxx.c
> +++ b/drivers/rtc/rtc-stmp3xxx.c
> @@ -139,7 +139,7 @@ static void stmp3xxx_wdt_register(struct platform_device *rtc_pdev)
>  	}
>  }
>  #else
> -static void stmp3xxx_wdt_register(struct device *dev)
> +static void stmp3xxx_wdt_register(struct platform_device *dev)
>  {
>  }
>  #endif /* CONFIG_STMP3XXX_RTC_WATCHDOG */
> -- 
> 1.8.2.rc2
> 
> 

Argh, this is already fixed in v3.9-rc1. Why didn't I see that !?.

Sorry for the noise.

Regards,
Steffen

Patch

diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c
index 33a8264..d2cc0c3 100644
--- a/drivers/rtc/rtc-stmp3xxx.c
+++ b/drivers/rtc/rtc-stmp3xxx.c
@@ -139,7 +139,7 @@  static void stmp3xxx_wdt_register(struct platform_device *rtc_pdev)
 	}
 }
 #else
-static void stmp3xxx_wdt_register(struct device *dev)
+static void stmp3xxx_wdt_register(struct platform_device *dev)
 {
 }
 #endif /* CONFIG_STMP3XXX_RTC_WATCHDOG */