All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Staging: Skein: skein_block: fixed 3 tab coding style isses
@ 2014-09-20 23:27 Mike Roocroft
  2014-09-24  6:41 ` Greg KH
  0 siblings, 1 reply; 3+ messages in thread
From: Mike Roocroft @ 2014-09-20 23:27 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel, mike.linux

Fixed a coding style issue

Signed-off-by: Mike Roocroft <mike.linux@btinternet.com>
---
 drivers/staging/skein/skein_block.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/skein/skein_block.c b/drivers/staging/skein/skein_block.c
index 04ce1d0..b969fe1 100644
--- a/drivers/staging/skein/skein_block.c
+++ b/drivers/staging/skein/skein_block.c
@@ -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]; }
 #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 */  \
@@ -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) \
-- 
2.1.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] Staging: Skein: skein_block: fixed 3 tab coding style isses
  2014-09-20 23:27 [PATCH] Staging: Skein: skein_block: fixed 3 tab coding style isses Mike Roocroft
@ 2014-09-24  6:41 ` Greg KH
  0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2014-09-24  6:41 UTC (permalink / raw)
  To: Mike Roocroft; +Cc: devel, linux-kernel

On Sun, Sep 21, 2014 at 12:27:07AM +0100, Mike Roocroft wrote:
> Fixed a coding style issue
> 
> Signed-off-by: Mike Roocroft <mike.linux@btinternet.com>
> ---
>  drivers/staging/skein/skein_block.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Someone else already sent in this change, sorry.

greg k-h

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Staging: Skein: skein_block: fixed 3 tab coding style isses
       [not found] <1411425935-867-1-git-send-email-mike.linux@btinternet.com>
@ 2014-09-24 19:27 ` Jason Cooper
  0 siblings, 0 replies; 3+ messages in thread
From: Jason Cooper @ 2014-09-24 19:27 UTC (permalink / raw)
  To: Mike Roocroft; +Cc: linux-kernel

Mike,

On Mon, Sep 22, 2014 at 11:45:35PM +0100, Mike Roocroft wrote:
> Fixed a coding style issue
> 
> Signed-off-by: Mike Roocroft <mike.linux@btinternet.com>
> ---
>  drivers/staging/skein/skein_block.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/skein/skein_block.c b/drivers/staging/skein/skein_block.c
> index 04ce1d0..b969fe1 100644
> --- a/drivers/staging/skein/skein_block.c
> +++ b/drivers/staging/skein/skein_block.c
> @@ -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.

>  #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 */  \
> @@ -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:

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

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

thx,

Jason.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-09-24 19:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-20 23:27 [PATCH] Staging: Skein: skein_block: fixed 3 tab coding style isses Mike Roocroft
2014-09-24  6:41 ` Greg KH
     [not found] <1411425935-867-1-git-send-email-mike.linux@btinternet.com>
2014-09-24 19:27 ` Jason Cooper

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.