2009-12-22 08:38:11

by Peter Huewe

Subject: [PATCH 09/10] w1: add __init/__exit macros to drivers/w1/w1.c

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init/__exit macros to the module_init/
module_exit functions of

drivers/w1/w1.c

Please have a look at the small patch and either pull it through
your tree, or please ack' it so Jiri can pull it through the trivial
tree.

Patch against linux-next-tree, 22. Dez 08:38:18 CET 2009
but also present in linus tree.

Signed-off-by: Peter Huewe <[email protected]>
---
drivers/w1/w1.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index acc7e3b..ad5897d 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -986,7 +986,7 @@ int w1_process(void *data)
return 0;
}

-static int w1_init(void)
+static int __init w1_init(void)
{
int retval;

@@ -1034,7 +1034,7 @@ err_out_exit_init:
return retval;
}

-static void w1_fini(void)
+static void __exit w1_fini(void)
{
struct w1_master *dev;

--
1.6.4.4

2010-01-05 10:29:00

by Jiri Kosina

Subject: Re: [PATCH 09/10] w1: add __init/__exit macros to drivers/w1/w1.c

On Tue, 22 Dec 2009, [email protected] wrote:

> From: Peter Huewe <[email protected]>
>
> Trivial patch which adds the __init/__exit macros to the module_init/
> module_exit functions of
>
> drivers/w1/w1.c
>
> Signed-off-by: Peter Huewe <[email protected]>
> ---
> drivers/w1/w1.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
> index acc7e3b..ad5897d 100644
> --- a/drivers/w1/w1.c
> +++ b/drivers/w1/w1.c
> @@ -986,7 +986,7 @@ int w1_process(void *data)
> return 0;
> }
>
> -static int w1_init(void)
> +static int __init w1_init(void)
> {
> int retval;
>
> @@ -1034,7 +1034,7 @@ err_out_exit_init:
> return retval;
> }
>
> -static void w1_fini(void)
> +static void __exit w1_fini(void)
> {
> struct w1_master *dev;
>

Applied, thanks.

--
Jiri Kosina
SUSE Labs, Novell Inc.