[PATCH] Remove errors caught by checkpatch.pl in kernel/utsname_sysctl.c

[PATCH] Remove errors caught by checkpatch.pl in kernel/utsname_sysctl.c

[Manish Katiyar]

Hi,

Below patch removes errors generated by checkpatch.pl in
kernel/utsname_sysctl.c. Caught by Ingo's code-quality script.


Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
---
 kernel/utsname_sysctl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
index 3b34b35..d1dc4ca 100644
--- a/kernel/utsname_sysctl.c
+++ b/kernel/utsname_sysctl.c
@@ -49,7 +49,7 @@ static int proc_do_uts_string(ctl_table *table, int
write, struct file *filp,
 	int r;
 	memcpy(&uts_table, table, sizeof(uts_table));
 	uts_table.data = get_uts(table, write);
-	r = proc_dostring(&uts_table,write,filp,buffer,lenp, ppos);
+	r = proc_dostring(&uts_table, write, filp, buffer, lenp, ppos);
 	put_uts(table, write, uts_table.data);
 	return r;
 }
@@ -142,4 +142,4 @@ static int __init utsname_sysctl_init(void)
 	return 0;
 }

-__initcall(utsname_sysctl_init);
+device_initcall(utsname_sysctl_init);
-- 
1.5.4.3


Thanks -
Manish

Re: [PATCH] Remove errors caught by checkpatch.pl in kernel/utsname_sysctl.c

[Stefan Richter]

Manish Katiyar wrote:
> --- a/kernel/utsname_sysctl.c
> +++ b/kernel/utsname_sysctl.c
> @@ -49,7 +49,7 @@ static int proc_do_uts_string(ctl_table *table, int
> write, struct file *filp,
>  	int r;
>  	memcpy(&uts_table, table, sizeof(uts_table));
>  	uts_table.data = get_uts(table, write);
> -	r = proc_dostring(&uts_table,write,filp,buffer,lenp, ppos);
> +	r = proc_dostring(&uts_table, write, filp, buffer, lenp, ppos);
>  	put_uts(table, write, uts_table.data);
>  	return r;
>  }
> @@ -142,4 +142,4 @@ static int __init utsname_sysctl_init(void)
>  	return 0;
>  }
> 
> -__initcall(utsname_sysctl_init);
> +device_initcall(utsname_sysctl_init);

The changelog should note that this is a whitespace fix + initcall
annotation change.

That checkpatch was somehow involved in the creation of this patch is
entirely uninteresting for the changelog.
-- 
Stefan Richter
-=====-==--= --=- =----
http://arcgraph.de/sr/

Re: [PATCH] Remove errors caught by checkpatch.pl in kernel/utsname_sysctl.c

[Manish Katiyar]

[resending with changed changelog based on stefan's comments]

On Mon, Feb 16, 2009 at 6:39 PM, Stefan Richter
<stefanr@s5r6.in-berlin.de> wrote:
> Manish Katiyar wrote:
>> --- a/kernel/utsname_sysctl.c
>> +++ b/kernel/utsname_sysctl.c
>> @@ -49,7 +49,7 @@ static int proc_do_uts_string(ctl_table *table, int
>> write, struct file *filp,
>>       int r;
>>       memcpy(&uts_table, table, sizeof(uts_table));
>>       uts_table.data = get_uts(table, write);
>> -     r = proc_dostring(&uts_table,write,filp,buffer,lenp, ppos);
>> +     r = proc_dostring(&uts_table, write, filp, buffer, lenp, ppos);
>>       put_uts(table, write, uts_table.data);
>>       return r;
>>  }
>> @@ -142,4 +142,4 @@ static int __init utsname_sysctl_init(void)
>>       return 0;
>>  }
>>
>> -__initcall(utsname_sysctl_init);
>> +device_initcall(utsname_sysctl_init);
>
> The changelog should note that this is a whitespace fix + initcall
> annotation change.
>
> That checkpatch was somehow involved in the creation of this patch is
> entirely uninteresting for the changelog.

Replace deprecated __initcall with equivalent device_initcall. Also
fix whitespaces.

Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
---
 kernel/utsname_sysctl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
index 3b34b35..d1dc4ca 100644
--- a/kernel/utsname_sysctl.c
+++ b/kernel/utsname_sysctl.c
@@ -49,7 +49,7 @@ static int proc_do_uts_string(ctl_table *table, int
write, struct file *filp,
 	int r;
 	memcpy(&uts_table, table, sizeof(uts_table));
 	uts_table.data = get_uts(table, write);
-	r = proc_dostring(&uts_table,write,filp,buffer,lenp, ppos);
+	r = proc_dostring(&uts_table, write, filp, buffer, lenp, ppos);
 	put_uts(table, write, uts_table.data);
 	return r;
 }
@@ -142,4 +142,4 @@ static int __init utsname_sysctl_init(void)
 	return 0;
 }

-__initcall(utsname_sysctl_init);
+device_initcall(utsname_sysctl_init);
-- 
1.5.4.3


Thanks -
Manish

> --
> Stefan Richter
> -=====-==--= --=- =----
> http://arcgraph.de/sr/
>

Re: [PATCH] Remove errors caught by checkpatch.pl in kernel/utsname_sysctl.c

[Stefan Richter]

Manish Katiyar wrote:
> On Mon, Feb 16, 2009 at 6:39 PM, Stefan Richter
> <stefanr@s5r6.in-berlin.de> wrote:
>> The changelog should note that this is a whitespace fix + initcall
>> annotation change.

Sorry, I didn't get the point of __initcall/device_initcall.  It's not
an annotation; it defines a call sequence level.

> Replace deprecated __initcall with equivalent device_initcall. Also
> fix whitespaces.
...
> --- a/kernel/utsname_sysctl.c
> +++ b/kernel/utsname_sysctl.c
...
> @@ -142,4 +142,4 @@ static int __init utsname_sysctl_init(void)
>  	return 0;
>  }
> 
> -__initcall(utsname_sysctl_init);
> +device_initcall(utsname_sysctl_init);

It is equivalent, but is it also the most appropriate one?
-- 
Stefan Richter
-=====-=-=== -=-= -==-=
http://arcgraph.de/sr/