2008-02-17 13:57:57

by Paolo Ciarrocchi

[permalink] [raw]
Subject: [PATCH 2/2] x86: coding style fixes arch/x86/lib/csum-wrappers_64.c

[PATCH 2/2] x86: coding style fixes arch/x86/lib/csum-wrappers_64.c

On top of the previous patch makes the file errors free according to checkpatch.pl

Signed-off-by: Paolo Ciarrocchi <[email protected]>
---
arch/x86/lib/csum-wrappers_64.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
index a8ce791..95e45dc 100644
--- a/arch/x86/lib/csum-wrappers_64.c
+++ b/arch/x86/lib/csum-wrappers_64.c
@@ -24,7 +24,7 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
{
might_sleep();
*errp = 0;
- if (likely(access_ok(VERIFY_READ,src, len))) {
+ if (likely(access_ok(VERIFY_READ, src, len))) {
/* Why 6, not 7? To handle odd addresses aligned we
would need to do considerable complications to fix the
checksum which is defined as an 16bit accumulator. The
@@ -51,7 +51,7 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
return isum;
}
*errp = -EFAULT;
- memset(dst,0,len);
+ memset(dst, 0, len);
return isum;
}

@@ -94,7 +94,6 @@ csum_partial_copy_to_user(const void *src, void __user *dst,

*errp = 0;
return csum_partial_copy_generic(src, (void __force *)dst, len, isum, NULL, errp);
-
}

EXPORT_SYMBOL(csum_partial_copy_to_user);
@@ -111,7 +110,7 @@ EXPORT_SYMBOL(csum_partial_copy_to_user);
__wsum
csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
{
- return csum_partial_copy_generic(src,dst,len,sum,NULL,NULL);
+ return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL);
}
EXPORT_SYMBOL(csum_partial_copy_nocheck);

@@ -129,7 +128,7 @@ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
" adcq 8(%[daddr]),%[sum]\n"
" adcq $0,%[sum]\n"
: [sum] "=r" (sum64)
- : "[sum]" (rest),[saddr] "r" (saddr), [daddr] "r" (daddr));
+ : "[sum]" (rest), [saddr] "r" (saddr), [daddr] "r" (daddr));
return csum_fold((__force __wsum)add32_with_carry(sum64 & 0xffffffff, sum64>>32));
}

--
1.5.4.1.183.gf873


2008-02-17 15:50:26

by Ingo Molnar

[permalink] [raw]
Subject: Re: [PATCH 2/2] x86: coding style fixes arch/x86/lib/csum-wrappers_64.c


* Paolo Ciarrocchi <[email protected]> wrote:

> [PATCH 2/2] x86: coding style fixes arch/x86/lib/csum-wrappers_64.c
>
> On top of the previous patch makes the file errors free according to
> checkpatch.pl

thanks Paolo, applied. (i've folded the two patches - as long as a
cleanup patch has no effect on generated code we want to deal with it in
a single unit)

Ingo

2008-02-17 18:32:17

by Paolo Ciarrocchi

[permalink] [raw]
Subject: Re: [PATCH 2/2] x86: coding style fixes arch/x86/lib/csum-wrappers_64.c

On 2/17/08, Ingo Molnar <[email protected]> wrote:
>
> * Paolo Ciarrocchi <[email protected]> wrote:
>
> > [PATCH 2/2] x86: coding style fixes arch/x86/lib/csum-wrappers_64.c
> >
> > On top of the previous patch makes the file errors free according to
> > checkpatch.pl
>
> thanks Paolo, applied. (i've folded the two patches - as long as a
> cleanup patch has no effect on generated code we want to deal with it in
> a single unit)


Ok, i'll keep that in mind for the next patches.

Ciao,
--
Paolo
http://paolo.ciarrocchi.googlepages.com/