[PATCH] hwmon: w83781d doesn't link when built-in

[PATCH] hwmon: w83781d doesn't link when built-in

[Geert Uytterhoeven]

When w83781d is built-in, the final links fails with the following vague error
message:

`.exit.text' referenced in section `.init.text' of drivers/built-in.o: defined
in discarded section `.exit.text' of drivers/built-in.o

w83781d_isa_unregister() cannot be marked __exit, as it's also called from
sensors_w83781d_init(), which is marked __init.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 drivers/hwmon/w83781d.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -1968,7 +1968,7 @@ exit:
 	return res;
 }
 
-static void __exit
+static void
 w83781d_isa_unregister(void)
 {
 	if (pdev) {
@@ -2017,7 +2017,7 @@ w83781d_isa_register(void)
 	return 0;
 }
 
-static void __exit
+static void
 w83781d_isa_unregister(void)
 {
 }

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: [PATCH] hwmon: w83781d doesn't link when built-in

[Jean Delvare]

Hi Geert,

On Sun, 26 Oct 2008 15:20:26 +0100 (CET), Geert Uytterhoeven wrote:
> When w83781d is built-in, the final links fails with the following vague error
> message:
> 
> `.exit.text' referenced in section `.init.text' of drivers/built-in.o: defined
> in discarded section `.exit.text' of drivers/built-in.o
> 
> w83781d_isa_unregister() cannot be marked __exit, as it's also called from
> sensors_w83781d_init(), which is marked __init.

Good catch, thanks for reporting. For some reason the link doesn't fail
here.

> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
>  drivers/hwmon/w83781d.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> --- a/drivers/hwmon/w83781d.c
> +++ b/drivers/hwmon/w83781d.c
> @@ -1968,7 +1968,7 @@ exit:
>  	return res;
>  }
>  
> -static void __exit
> +static void
>  w83781d_isa_unregister(void)
>  {
>  	if (pdev) {
> @@ -2017,7 +2017,7 @@ w83781d_isa_register(void)
>  	return 0;
>  }
>  
> -static void __exit
> +static void
>  w83781d_isa_unregister(void)
>  {
>  }

Applied, thanks. I'll send this to Linus together with several other
hwmon patches later today.

-- 
Jean Delvare

Re: [PATCH] hwmon: w83781d doesn't link when built-in

[Geert Uytterhoeven]

On Sun, 26 Oct 2008, Jean Delvare wrote:
> On Sun, 26 Oct 2008 15:20:26 +0100 (CET), Geert Uytterhoeven wrote:
> > When w83781d is built-in, the final links fails with the following vague error
> > message:
> > 
> > `.exit.text' referenced in section `.init.text' of drivers/built-in.o: defined
> > in discarded section `.exit.text' of drivers/built-in.o
> > 
> > w83781d_isa_unregister() cannot be marked __exit, as it's also called from
> > sensors_w83781d_init(), which is marked __init.
> 
> Good catch, thanks for reporting. For some reason the link doesn't fail
> here.

Probably w83781d_isa_unregister() got inlined?

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds