staging:skein:threefish_block.c remove blank lines
PATCH 1/1 staging:skein:threefish_block.c remove blank lines
Made suggested modifications from checkpatch in reference to CHECK: Please don't use multiple blank lines
--- drivers/staging/skein/threefish_block.c | 16 ---------------- 1 file changed, 16 deletions(-)
drivers/staging/skein/threefish_block.c +0 -16
@@ -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;
Signature · 1 line
2.1.4
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.
Quoted 13 lines · Walt Feasel
Made suggested modifications from checkpatch in reference to CHECK: Please don't use multiple blank lines
Signed-off-by Walt Feasel <[email protected]>--- drivers/staging/skein/threefish_block.c | 16 ---------------- 1 file changed, 16 deletions(-)drivers/staging/skein/threefish_block.c +0
-0
drivers/staging/skein/threefish_block.c void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, · line 67
Quoted 4 lines
drivers/staging/skein/threefish_block.c +0
-1@@ -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.
Quoted 126 lines
drivers/staging/skein/threefish_block.c +0
-15b1 += 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;Signature · 1 line
2.1.4
Please just delete the blank lines. You aren't that special like a snow flake.
regards,
dan carpetner
Greg KH
maintainerQuoted 2 lines · Dan Carpenter
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
Hi Dan,
Quoted 1 line · Dan Carpenter
Please just delete the blank lines.
Sure, if that's what you guys prefer.
Quoted 1 line
You aren't that special like a snow flake.
Someone put his grumpy pants on backwards, didn't he?
thx,
Jason.
Hi Walt,
Please ignore our side conversation,
Quoted 4 lines · Walt Feasel
Made suggested modifications from checkpatch in reference to CHECK: Please don't use multiple blank lines
Signed-off-by Walt Feasel <[email protected]>
thx,
Jason.