* [PATCH] staging: skein: cleanup: Remove multiple blank lines
@ 2016-07-15 0:54 Hugo Miguel Silva Ferreira
2016-07-15 15:37 ` Jason Cooper
0 siblings, 1 reply; 2+ messages in thread
From: Hugo Miguel Silva Ferreira @ 2016-07-15 0:54 UTC (permalink / raw)
To: linux-kernel; +Cc: joe, gregkh
This patch fixes several warnings detected by the checkpatch.pl script.
Signed-off-by: Hugo Miguel Silva Ferreira <hugo8899@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.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] staging: skein: cleanup: Remove multiple blank lines
2016-07-15 0:54 [PATCH] staging: skein: cleanup: Remove multiple blank lines Hugo Miguel Silva Ferreira
@ 2016-07-15 15:37 ` Jason Cooper
0 siblings, 0 replies; 2+ messages in thread
From: Jason Cooper @ 2016-07-15 15:37 UTC (permalink / raw)
To: Hugo Miguel Silva Ferreira; +Cc: linux-kernel, joe, gregkh
Hi Hugo,
On Fri, Jul 15, 2016 at 01:54:40AM +0100, Hugo Miguel Silva Ferreira wrote:
> This patch fixes several warnings detected by the checkpatch.pl script.
>
> Signed-off-by: Hugo Miguel Silva Ferreira <hugo8899@gmail.com>
> ---
> drivers/staging/skein/threefish_block.c | 16 ----------------
> 1 file changed, 16 deletions(-)
Sorry, but that's a Nack from me.
> 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;
>
> -
If you look at the source code now versus the source code I started with
from Werner Dittman, you'll see that the extra blank line conveys
information about grouping of operations.
The proper 'fix' here is to use a comment at the beginning of each
grouping, instead of the extra blank line.
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.7.4
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-15 15:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-15 0:54 [PATCH] staging: skein: cleanup: Remove multiple blank lines Hugo Miguel Silva Ferreira
2016-07-15 15:37 ` Jason Cooper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).