[PATCH 10/19] watchdog: at91sam9: at91_wdt_dt_ids cannot be __init

On Mon, Jan 28, 2013 at 9:32 AM, Nicolas Ferre [off-list ref] wrote:

On 01/25/2013 11:44 PM, Arnd Bergmann :

quoted

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>
Cc: Wim Van Sebroeck <redacted>
Cc: linux-watchdog at vger.kernel.org
Cc: Nicolas Ferre <redacted>

Acked-by: Nicolas Ferre <redacted>

Thanks,

quoted

Cc: Fabio Porcedda <redacted>

Tested-by: Fabio Porcedda <redacted>

Thanks.

quoted

---
 drivers/watchdog/at91sam9_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index dc42e44..6dad954 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c

@@ -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 */ }
 };

--
Nicolas Ferre

--
Fabio Porcedda