[17/25] watchdog/mpc8xxx: add a const qualifier

Submitted by Uwe Kleine-König on July 23, 2012, 9:13 a.m.

Details

Message ID 1343034810-3386-18-git-send-email-u.kleine-koenig@pengutronix.de
State Not Applicable
Headers show

Commit Message

Uwe Kleine-König July 23, 2012, 9:13 a.m.
From: Arnd Bergmann <arnd@arndb.de>

This prepares *of_device_id.data becoming const. Without this change
the following warning would occur:

	drivers/watchdog/mpc8xxx_wdt.c: In function 'mpc8xxx_wdt_probe':
	drivers/watchdog/mpc8xxx_wdt.c:203:11: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[ukl: split Arnd's patch by driver and add changelog]
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/watchdog/mpc8xxx_wdt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Wim Van Sebroeck July 23, 2012, 10:37 a.m.
Hi Uwe,

> From: Arnd Bergmann <arnd@arndb.de>
> 
> This prepares *of_device_id.data becoming const. Without this change
> the following warning would occur:
> 
> 	drivers/watchdog/mpc8xxx_wdt.c: In function 'mpc8xxx_wdt_probe':
> 	drivers/watchdog/mpc8xxx_wdt.c:203:11: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> [ukl: split Arnd's patch by driver and add changelog]
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Acked-by: Wim Van Sebroeck <wim@iguana.be>

Kind regards,
Wim.

Patch hide | download patch | download mbox

diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index 40f7bf1..e6a038a 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -193,7 +193,7 @@  static int __devinit mpc8xxx_wdt_probe(struct platform_device *ofdev)
 	int ret;
 	const struct of_device_id *match;
 	struct device_node *np = ofdev->dev.of_node;
-	struct mpc8xxx_wdt_type *wdt_type;
+	const struct mpc8xxx_wdt_type *wdt_type;
 	u32 freq = fsl_get_sys_freq();
 	bool enabled;