[PATCH] staging: skein: Fixed Conditional white space problems

Greg KH gregkh at linuxfoundation.org
Sun Sep 28 22:14:45 UTC 2014


On Sun, Sep 28, 2014 at 05:08:28PM -0500, Eric Rost wrote:
> This patch fixes the following checkpatch.pl Warnings:
> 
> WARNING: suspect code indent for conditional statements (16, 16)
> +               for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_512)
> [...]
> +               {
> 
> WARNING: suspect code indent for conditional statements (16, 16)
> +               for (r = 1; r <= 2 * RCNT; r += 2 * SKEIN_UNROLL_1024)
> [...]
> +               {
> 
> Signed-off-by: Eric Rost <eric.rost at mybabylon.net>
> ---
>  drivers/staging/skein/skein_block.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/skein/skein_block.c b/drivers/staging/skein/skein_block.c
> index 616364f..bbb5a5b 100644
> --- a/drivers/staging/skein/skein_block.c
> +++ b/drivers/staging/skein/skein_block.c
> @@ -380,7 +380,7 @@ do { \
>  
>  		for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_512)
>  #endif /* end of looped code definitions */
> -		{
> +			{

I'm glad you are trying to fix things, but in looking at this closer,
does it look correct to you?

>  #define R512_8_ROUNDS(R)  /* do 8 full rounds */  \
>  do { \
>  		R512(0, 1, 2, 3, 4, 5, 6, 7, R_512_0, 8 * (R) + 1);   \
> @@ -447,7 +447,7 @@ do { \
>  	#if  (SKEIN_UNROLL_512 > 14)
>  #error  "need more unrolling in skein_512_process_block"
>  	#endif
> -		}
> +			}

same here?

How about working on getting rid of the #if crap in this driver, that
will fix up this { } mess automatically.

thanks,

greg k-h


More information about the devel mailing list