[PATCH 2/4] staging: skein: cleanup: fixed blank lines

Manu Kumar maraku at gmx.com
Tue Apr 5 03:08:06 UTC 2016


Added a blank line between functions in skein_block.c and removed unneeded
blank lines in skein_api.c and threefish_block.c

Signed-off-by: Manu Kumar <maraku at gmx.com>
---
 drivers/staging/skein/skein_api.c       |  1 -
 drivers/staging/skein/skein_block.c     |  4 +++-
 drivers/staging/skein/threefish_block.c | 16 ----------------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/drivers/staging/skein/skein_api.c b/drivers/staging/skein/skein_api.c
index 36f849f..e23cb16 100644
--- a/drivers/staging/skein/skein_api.c
+++ b/drivers/staging/skein/skein_api.c
@@ -165,7 +165,6 @@ int skein_update(struct skein_ctx *ctx, const u8 *msg,
 		break;
 	}
 	return ret;
-
 }

 int skein_update_bits(struct skein_ctx *ctx, const u8 *msg,
diff --git a/drivers/staging/skein/skein_block.c b/drivers/staging/skein/skein_block.c
index 64047d7b..0c372be 100644
--- a/drivers/staging/skein/skein_block.c
+++ b/drivers/staging/skein/skein_block.c
@@ -463,6 +463,7 @@ size_t skein_256_process_block_code_size(void)
 	return ((u8 *) skein_256_process_block_code_size) -
 		((u8 *) skein_256_process_block);
 }
+
 unsigned int skein_256_unroll_cnt(void)
 {
 	return SKEIN_UNROLL_256;
@@ -545,7 +546,6 @@ void skein_512_process_block(struct skein_512_ctx *ctx, const u8 *blk_ptr,
 		for (r = 1;
 			r < (SKEIN_UNROLL_512 ? 2 * RCNT : 2);
 			r += (SKEIN_UNROLL_512 ? 2 * SKEIN_UNROLL_512 : 1)) {
-
 			R512_8_ROUNDS(0);

 #if   R512_UNROLL_R(1)
@@ -614,6 +614,7 @@ size_t skein_512_process_block_code_size(void)
 	return ((u8 *) skein_512_process_block_code_size) -
 		((u8 *) skein_512_process_block);
 }
+
 unsigned int skein_512_unroll_cnt(void)
 {
 	return SKEIN_UNROLL_512;
@@ -778,6 +779,7 @@ size_t skein_1024_process_block_code_size(void)
 	return ((u8 *) skein_1024_process_block_code_size) -
 		((u8 *) skein_1024_process_block);
 }
+
 unsigned int skein_1024_unroll_cnt(void)
 {
 	return SKEIN_UNROLL_1024;
diff --git a/drivers/staging/skein/threefish_block.c b/drivers/staging/skein/threefish_block.c
index e19ac43..5ebc918 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 = (tmp >> 32) | (tmp << (64 - 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 = (tmp >> 32) | (tmp << (64 - 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 = (tmp >> 32) | (tmp << (64 - 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 = (tmp >> 32) | (tmp << (64 - 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 = (tmp >> 32) | (tmp << (64 - 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 = (tmp >> 32) | (tmp << (64 - 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 = (tmp >> 32) | (tmp << (64 - 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 = (tmp >> 32) | (tmp << (64 - 32));
 	b0 -= b3;
--
2.8.0



More information about the devel mailing list