watchdog: at91sam9: at91_wdt_dt_ids cannot be __init
authorArnd Bergmann <arnd@arndb.de>
Fri, 25 Jan 2013 14:14:27 +0000 (14:14 +0000)
committerWim Van Sebroeck <wim@iguana.be>
Fri, 1 Mar 2013 11:16:47 +0000 (12:16 +0100)
The device IDs are referenced by the driver and potentially
used beyond the init time, as kbuild correctly warns
about. Remove the __initconst annotation.

Without this patch, building at91_dt_defconfig results in:

WARNING: drivers/watchdog/built-in.o(.data+0x28): Section mismatch in reference from the variable at91wdt_driver to the (unknown reference) .init.rodata:(unknown)
The variable at91wdt_driver references
the (unknown reference) __initconst (unknown)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Tested-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Cc: linux-watchdog@vger.kernel.org
drivers/watchdog/at91sam9_wdt.c

index c08933cc565e19c2b73ec9b9824a55d7aa983071..feb203f39e1a33e3727de420788f30024985165f 100644 (file)
@@ -304,7 +304,7 @@ static int __exit at91wdt_remove(struct platform_device *pdev)
 }
 
 #if defined(CONFIG_OF)
-static const struct of_device_id at91_wdt_dt_ids[] __initconst = {
+static const struct of_device_id at91_wdt_dt_ids[] = {
        { .compatible = "atmel,at91sam9260-wdt" },
        { /* sentinel */ }
 };