Skip to contentSkip to conversation

Staging: Skein: skein_block: fixed 3 tab coding style isses

PATCH Jason Cooper 1 participant 1 message Sep 24, 2014 1 message not in the archive

lore
Share & tools
lore

Jason Cooper

author Acked-by
#1 lore raw
In reply to a message not in the archive

Mike,

Quoted 12 lines · Mike Roocroft

Fixed a coding style issue

---
 drivers/staging/skein/skein_block.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/skein/skein_block.c +0 -0
index 04ce1d0..b969fe1 100644

drivers/staging/skein/skein_block.c line 37

Quoted 5 lines
drivers/staging/skein/skein_block.c +1 -1
@@ -34,7 +34,7 @@
 
 #ifdef SKEIN_DEBUG
 #define debug_save_tweak(ctx) { \
-                        ctx->h.tweak[0] = ts[0]; ctx->h.tweak[1] = ts[1]; }
+			ctx->h.tweak[0] = ts[0]; ctx->h.tweak[1] = ts[1]; }

hmm, yes. I somehow missed this during my original cleanup.

Quoted 13 lines
drivers/staging/skein/skein_block.c +1 -1
 #else
 #define debug_save_tweak(ctx)
 #endif
@@ -378,7 +378,7 @@ do { \
 	skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \
 } while (0)
 
-		for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_512)
+	for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_512)
 #endif /* end of looped code definitions */
 		{
 #define R512_8_ROUNDS(R)  /* do 8 full rounds */  \

drivers/staging/skein/skein_block.c do { \ · line 663

Quoted 8 lines
drivers/staging/skein/skein_block.c +1 -1
@@ -657,7 +657,7 @@ do { \
 	skein_show_r_ptr(BLK_BITSi, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \
 } while (0)
 
-		for (r = 1; r <= 2 * RCNT; r += 2 * SKEIN_UNROLL_1024)
+	for (r = 1; r <= 2 * RCNT; r += 2 * SKEIN_UNROLL_1024)
 #endif
 		{
 #define R1024_8_ROUNDS(R) \

ugghh. These two changes are conceptually fine, but they have reminded me that I need to completely rework this macro hell.

At any rate, the patch itself is fine for the staging tree.

Please re-send with my:

Make sure to include the staging ml and gregkh on the resend.

thx,

Jason.