* [PATCH] watchdog: asm9260: remove __init and __exit annotations
@ 2016-01-08 10:59 Arnd Bergmann
2016-01-08 14:35 ` Guenter Roeck
2016-01-11 21:53 ` Wim Van Sebroeck
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2016-01-08 10:59 UTC (permalink / raw)
To: Wim Van Sebroeck, linux-watchdog
Cc: Oleksij Rempel, Guenter Roeck, linux-arm-kernel, linux-kernel
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")
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);
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] watchdog: asm9260: remove __init and __exit annotations
2016-01-08 10:59 [PATCH] watchdog: asm9260: remove __init and __exit annotations Arnd Bergmann
@ 2016-01-08 14:35 ` Guenter Roeck
2016-01-11 21:53 ` Wim Van Sebroeck
1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2016-01-08 14:35 UTC (permalink / raw)
To: Arnd Bergmann, Wim Van Sebroeck, linux-watchdog
Cc: Oleksij Rempel, linux-arm-kernel, linux-kernel
On 01/08/2016 02:59 AM, Arnd Bergmann wrote:
> 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")
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>
> 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);
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] watchdog: asm9260: remove __init and __exit annotations
2016-01-08 10:59 [PATCH] watchdog: asm9260: remove __init and __exit annotations Arnd Bergmann
2016-01-08 14:35 ` Guenter Roeck
@ 2016-01-11 21:53 ` Wim Van Sebroeck
1 sibling, 0 replies; 3+ messages in thread
From: Wim Van Sebroeck @ 2016-01-11 21:53 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-watchdog, Oleksij Rempel, Guenter Roeck, linux-arm-kernel,
linux-kernel
Hi Arnd,
> 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")
>
> 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);
>
>
This patch has been added to linux-watchdog-next.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-01-11 21:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-08 10:59 [PATCH] watchdog: asm9260: remove __init and __exit annotations Arnd Bergmann
2016-01-08 14:35 ` Guenter Roeck
2016-01-11 21:53 ` Wim Van Sebroeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox