Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1520366 > unrolled thread

[PATCH] [STYLE]staging:skein:threefish_block.c remove blank lines

Started byWalt Feasel <waltfeasel@gmail.com>
First post2016-11-12 21:10 +0100
Last post2016-11-15 22:00 +0100
Articles 6 — 4 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] [STYLE]staging:skein:threefish_block.c remove blank lines Walt Feasel <waltfeasel@gmail.com> - 2016-11-12 21:10 +0100
    Re: [PATCH] [STYLE]staging:skein:threefish_block.c remove blank lines Jason Cooper <jason@lakedaemon.net> - 2016-11-13 00:20 +0100
      Re: [PATCH] [STYLE]staging:skein:threefish_block.c remove blank lines Dan Carpenter <dan.carpenter@oracle.com> - 2016-11-14 11:40 +0100
        Re: [PATCH] [STYLE]staging:skein:threefish_block.c remove blank lines Greg KH <gregkh@linuxfoundation.org> - 2016-11-14 15:40 +0100
        Re: [PATCH] [STYLE]staging:skein:threefish_block.c remove blank lines Jason Cooper <jason@lakedaemon.net> - 2016-11-15 22:00 +0100
    Re: [PATCH] [STYLE]staging:skein:threefish_block.c remove blank lines Jason Cooper <jason@lakedaemon.net> - 2016-11-15 22:00 +0100

#1520366 — [PATCH] [STYLE]staging:skein:threefish_block.c remove blank lines

FromWalt Feasel <waltfeasel@gmail.com>
Date2016-11-12 21:10 +0100
Subject[PATCH] [STYLE]staging:skein:threefish_block.c remove blank lines
Message-ID<sCMMF-6RF-5@gated-at.bofh.it>
Made suggested modifications from checkpatch in reference
to CHECK: Please don't use multiple blank lines

Signed-off-by: Walt Feasel <waltfeasel@gmail.com>
---
 drivers/staging/skein/threefish_block.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/drivers/staging/skein/threefish_block.c b/drivers/staging/skein/threefish_block.c
index a95563f..5064065 100644
--- a/drivers/staging/skein/threefish_block.c
+++ b/drivers/staging/skein/threefish_block.c
@@ -64,7 +64,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 += b1;
 	b1 = rol64(b1, 32) ^ b2;
 
-
 	b1 += k3 + t2;
 	b0 += b1 + k2;
 	b1 = rol64(b1, 14) ^ b0;
@@ -117,7 +116,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 += b1;
 	b1 = rol64(b1, 32) ^ b2;
 
-
 	b1 += k0 + t1;
 	b0 += b1 + k4;
 	b1 = rol64(b1, 14) ^ b0;
@@ -170,7 +168,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 += b1;
 	b1 = rol64(b1, 32) ^ b2;
 
-
 	b1 += k2 + t0;
 	b0 += b1 + k1;
 	b1 = rol64(b1, 14) ^ b0;
@@ -223,7 +220,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 += b1;
 	b1 = rol64(b1, 32) ^ b2;
 
-
 	b1 += k4 + t2;
 	b0 += b1 + k3;
 	b1 = rol64(b1, 14) ^ b0;
@@ -276,7 +272,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 += b1;
 	b1 = rol64(b1, 32) ^ b2;
 
-
 	b1 += k1 + t1;
 	b0 += b1 + k0;
 	b1 = rol64(b1, 14) ^ b0;
@@ -329,7 +324,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 += b1;
 	b1 = rol64(b1, 32) ^ b2;
 
-
 	b1 += k3 + t0;
 	b0 += b1 + k2;
 	b1 = rol64(b1, 14) ^ b0;
@@ -382,7 +376,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 += b1;
 	b1 = rol64(b1, 32) ^ b2;
 
-
 	b1 += k0 + t2;
 	b0 += b1 + k4;
 	b1 = rol64(b1, 14) ^ b0;
@@ -435,7 +428,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 += b1;
 	b1 = rol64(b1, 32) ^ b2;
 
-
 	b1 += k2 + t1;
 	b0 += b1 + k1;
 	b1 = rol64(b1, 14) ^ b0;
@@ -579,7 +571,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 -= b3 + k3 + t2;
 	b3 -= k4 + 16;
 
-
 	tmp = b3 ^ b0;
 	b3 = ror64(tmp, 32);
 	b0 -= b3;
@@ -648,7 +639,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 -= b3 + k1 + t0;
 	b3 -= k2 + 14;
 
-
 	tmp = b3 ^ b0;
 	b3 = ror64(tmp, 32);
 	b0 -= b3;
@@ -717,7 +707,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 -= b3 + k4 + t1;
 	b3 -= k0 + 12;
 
-
 	tmp = b3 ^ b0;
 	b3 = ror64(tmp, 32);
 	b0 -= b3;
@@ -786,7 +775,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 -= b3 + k2 + t2;
 	b3 -= k3 + 10;
 
-
 	tmp = b3 ^ b0;
 	b3 = ror64(tmp, 32);
 	b0 -= b3;
@@ -855,7 +843,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 -= b3 + k0 + t0;
 	b3 -= k1 + 8;
 
-
 	tmp = b3 ^ b0;
 	b3 = ror64(tmp, 32);
 	b0 -= b3;
@@ -924,7 +911,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 -= b3 + k3 + t1;
 	b3 -= k4 + 6;
 
-
 	tmp = b3 ^ b0;
 	b3 = ror64(tmp, 32);
 	b0 -= b3;
@@ -993,7 +979,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 -= b3 + k1 + t2;
 	b3 -= k2 + 4;
 
-
 	tmp = b3 ^ b0;
 	b3 = ror64(tmp, 32);
 	b0 -= b3;
@@ -1062,7 +1047,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
 	b2 -= b3 + k4 + t0;
 	b3 -= k0 + 2;
 
-
 	tmp = b3 ^ b0;
 	b3 = ror64(tmp, 32);
 	b0 -= b3;
-- 
2.1.4

[toc] | [next] | [standalone]

#1520433

FromJason Cooper <jason@lakedaemon.net>
Date2016-11-13 00:20 +0100
Message-ID<sCPKx-rc-1@gated-at.bofh.it>
In reply to#1520366
Hi Walt,

Thanks for the patch, unfortunately, it's a NAK.  If you search the ml
archives, you'll see this has been addressed before.

On Sat, Nov 12, 2016 at 03:02:53PM -0500, Walt Feasel wrote:
> Made suggested modifications from checkpatch in reference
> to CHECK: Please don't use multiple blank lines
> 
> Signed-off-by: Walt Feasel <waltfeasel@gmail.com>
> ---
>  drivers/staging/skein/threefish_block.c | 16 ----------------
>  1 file changed, 16 deletions(-)
> 
> diff --git a/drivers/staging/skein/threefish_block.c b/drivers/staging/skein/threefish_block.c
> index a95563f..5064065 100644
> --- a/drivers/staging/skein/threefish_block.c
> +++ b/drivers/staging/skein/threefish_block.c
> @@ -64,7 +64,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 += b1;
>  	b1 = rol64(b1, 32) ^ b2;
>  
> -

The double lines are deliberate to show a logical separation between the
blocks of code.  Ideally, the second blank line would be a comment
describing the following block.  However, I'm not smart enough yet to
add correct comments.  So, the blank lines remain. :-/

thx,

Jason.

>  	b1 += k3 + t2;
>  	b0 += b1 + k2;
>  	b1 = rol64(b1, 14) ^ b0;
> @@ -117,7 +116,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 += b1;
>  	b1 = rol64(b1, 32) ^ b2;
>  
> -
>  	b1 += k0 + t1;
>  	b0 += b1 + k4;
>  	b1 = rol64(b1, 14) ^ b0;
> @@ -170,7 +168,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 += b1;
>  	b1 = rol64(b1, 32) ^ b2;
>  
> -
>  	b1 += k2 + t0;
>  	b0 += b1 + k1;
>  	b1 = rol64(b1, 14) ^ b0;
> @@ -223,7 +220,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 += b1;
>  	b1 = rol64(b1, 32) ^ b2;
>  
> -
>  	b1 += k4 + t2;
>  	b0 += b1 + k3;
>  	b1 = rol64(b1, 14) ^ b0;
> @@ -276,7 +272,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 += b1;
>  	b1 = rol64(b1, 32) ^ b2;
>  
> -
>  	b1 += k1 + t1;
>  	b0 += b1 + k0;
>  	b1 = rol64(b1, 14) ^ b0;
> @@ -329,7 +324,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 += b1;
>  	b1 = rol64(b1, 32) ^ b2;
>  
> -
>  	b1 += k3 + t0;
>  	b0 += b1 + k2;
>  	b1 = rol64(b1, 14) ^ b0;
> @@ -382,7 +376,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 += b1;
>  	b1 = rol64(b1, 32) ^ b2;
>  
> -
>  	b1 += k0 + t2;
>  	b0 += b1 + k4;
>  	b1 = rol64(b1, 14) ^ b0;
> @@ -435,7 +428,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 += b1;
>  	b1 = rol64(b1, 32) ^ b2;
>  
> -
>  	b1 += k2 + t1;
>  	b0 += b1 + k1;
>  	b1 = rol64(b1, 14) ^ b0;
> @@ -579,7 +571,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 -= b3 + k3 + t2;
>  	b3 -= k4 + 16;
>  
> -
>  	tmp = b3 ^ b0;
>  	b3 = ror64(tmp, 32);
>  	b0 -= b3;
> @@ -648,7 +639,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 -= b3 + k1 + t0;
>  	b3 -= k2 + 14;
>  
> -
>  	tmp = b3 ^ b0;
>  	b3 = ror64(tmp, 32);
>  	b0 -= b3;
> @@ -717,7 +707,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 -= b3 + k4 + t1;
>  	b3 -= k0 + 12;
>  
> -
>  	tmp = b3 ^ b0;
>  	b3 = ror64(tmp, 32);
>  	b0 -= b3;
> @@ -786,7 +775,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 -= b3 + k2 + t2;
>  	b3 -= k3 + 10;
>  
> -
>  	tmp = b3 ^ b0;
>  	b3 = ror64(tmp, 32);
>  	b0 -= b3;
> @@ -855,7 +843,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 -= b3 + k0 + t0;
>  	b3 -= k1 + 8;
>  
> -
>  	tmp = b3 ^ b0;
>  	b3 = ror64(tmp, 32);
>  	b0 -= b3;
> @@ -924,7 +911,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 -= b3 + k3 + t1;
>  	b3 -= k4 + 6;
>  
> -
>  	tmp = b3 ^ b0;
>  	b3 = ror64(tmp, 32);
>  	b0 -= b3;
> @@ -993,7 +979,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 -= b3 + k1 + t2;
>  	b3 -= k2 + 4;
>  
> -
>  	tmp = b3 ^ b0;
>  	b3 = ror64(tmp, 32);
>  	b0 -= b3;
> @@ -1062,7 +1047,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
>  	b2 -= b3 + k4 + t0;
>  	b3 -= k0 + 2;
>  
> -
>  	tmp = b3 ^ b0;
>  	b3 = ror64(tmp, 32);
>  	b0 -= b3;
> -- 
> 2.1.4
>

[toc] | [prev] | [next] | [standalone]

#1521518

FromDan Carpenter <dan.carpenter@oracle.com>
Date2016-11-14 11:40 +0100
Message-ID<sDmQa-5Ml-27@gated-at.bofh.it>
In reply to#1520433
Please just delete the blank lines.  You aren't that special like a snow
flake.

regards,
dan carpetner

[toc] | [prev] | [next] | [standalone]

#1521698

FromGreg KH <gregkh@linuxfoundation.org>
Date2016-11-14 15:40 +0100
Message-ID<sDqAq-8cD-27@gated-at.bofh.it>
In reply to#1521518
On Mon, Nov 14, 2016 at 01:34:15PM +0300, Dan Carpenter wrote:
> Please just delete the blank lines.  You aren't that special like a snow
> flake.

I agree, they need to be removed so that we don't have people waste time
on this, and the code gets closer to the correct kernel style rules.

thanks,

greg k-h

[toc] | [prev] | [next] | [standalone]

#1523062

FromJason Cooper <jason@lakedaemon.net>
Date2016-11-15 22:00 +0100
Message-ID<sDSZI-1sK-25@gated-at.bofh.it>
In reply to#1521518
Hi Dan,

On Mon, Nov 14, 2016 at 01:34:15PM +0300, Dan Carpenter wrote:
> Please just delete the blank lines.

Sure, if that's what you guys prefer.

> You aren't that special like a snow flake.

Someone put his grumpy pants on backwards, didn't he?

thx,

Jason.

[toc] | [prev] | [next] | [standalone]

#1523060

FromJason Cooper <jason@lakedaemon.net>
Date2016-11-15 22:00 +0100
Message-ID<sDSZI-1sK-11@gated-at.bofh.it>
In reply to#1520366
Hi Walt,

Please ignore our side conversation,

On Sat, Nov 12, 2016 at 03:02:53PM -0500, Walt Feasel wrote:
> Made suggested modifications from checkpatch in reference
> to CHECK: Please don't use multiple blank lines
> 
> Signed-off-by: Walt Feasel <waltfeasel@gmail.com>

Acked-by: Jason Cooper <jason@lakedaemon.net>

thx,

Jason.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web