diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-01-08 11:59:34 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2016-01-11 22:48:05 +0100 |
| commit | ac36856fe4321454b6789c019c96c3ec854094ed (patch) | |
| tree | b8598e014620e579b949f38b312f50ac1d950f64 /drivers/watchdog | |
| parent | 0254e953537c92df3e7d0176f401a211e944fd61 (diff) | |
| download | linux-ac36856fe4321454b6789c019c96c3ec854094ed.tar.gz linux-ac36856fe4321454b6789c019c96c3ec854094ed.tar.bz2 linux-ac36856fe4321454b6789c019c96c3ec854094ed.zip | |
watchdog: asm9260: remove __init and __exit annotations
The probe and release functions in this driver are marked
as __init and __exit, but this is wrong as indicated by this
Kbuild error message:
WARNING: vmlinux.o(.data+0x1d2308): Section mismatch in reference from the variable asm9260_wdt_driver to the function .init.text:asm9260_wdt_probe()
This removes the annotations, to make the sysfs unbind attribute
and deferred probing work.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: aae03dc98177 ("watchdog: add Alphascale asm9260-wdt driver")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/asm9260_wdt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/watchdog/asm9260_wdt.c b/drivers/watchdog/asm9260_wdt.c index 1c22ff4c523a..c9686b2fdafd 100644 --- a/drivers/watchdog/asm9260_wdt.c +++ b/drivers/watchdog/asm9260_wdt.c @@ -198,7 +198,7 @@ static struct watchdog_ops asm9260_wdt_ops = { .set_timeout = asm9260_wdt_settimeout, }; -static int __init asm9260_wdt_get_dt_clks(struct asm9260_wdt_priv *priv) +static int asm9260_wdt_get_dt_clks(struct asm9260_wdt_priv *priv) { int err; unsigned long clk; @@ -250,7 +250,7 @@ static int __init asm9260_wdt_get_dt_clks(struct asm9260_wdt_priv *priv) return 0; } -static void __init asm9260_wdt_get_dt_mode(struct asm9260_wdt_priv *priv) +static void asm9260_wdt_get_dt_mode(struct asm9260_wdt_priv *priv) { const char *tmp; int ret; @@ -274,7 +274,7 @@ static void __init asm9260_wdt_get_dt_mode(struct asm9260_wdt_priv *priv) tmp); } -static int __init asm9260_wdt_probe(struct platform_device *pdev) +static int asm9260_wdt_probe(struct platform_device *pdev) { struct asm9260_wdt_priv *priv; struct watchdog_device *wdd; @@ -364,7 +364,7 @@ static void asm9260_wdt_shutdown(struct platform_device *pdev) asm9260_wdt_disable(&priv->wdd); } -static int __exit asm9260_wdt_remove(struct platform_device *pdev) +static int asm9260_wdt_remove(struct platform_device *pdev) { struct asm9260_wdt_priv *priv = platform_get_drvdata(pdev); |