From: Arnd Bergmann Date: Mon, 21 May 2012 19:57:39 +0000 (+0200) Subject: watchdog/mpc8xxx: add a const qualifier X-Git-Tag: next-20120725~11^2^2^2~8 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c4a1e33b254b6d40a8540b31e69deb92436b4fab;p=karo-tx-linux.git watchdog/mpc8xxx: add a const qualifier 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 [ukl: split Arnd's patch by driver and add changelog] Acked-by: Wim Van Sebroeck Signed-off-by: Uwe Kleine-König --- diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index 40f7bf1f8654..e6a038ae8dc2 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;