2021-03-26 18:37:06

by Milan Djurovic

Subject: [PATCH] crypto: fcrypt: Remove 'do while(0)' loop for single statement macro

Remove the 'do while(0)' loop in the macro, as it is not needed for single
statement macros. Condense into one line.

Signed-off-by: Milan Djurovic <[email protected]>
---
crypto/fcrypt.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/crypto/fcrypt.c b/crypto/fcrypt.c
index c36ea0c8be98..76a04d000c0d 100644
--- a/crypto/fcrypt.c
+++ b/crypto/fcrypt.c
@@ -63,10 +63,7 @@ do { \
} while (0)

/* Rotate right one 64 bit number as a 56 bit number */
-#define ror56_64(k, n) \
-do { \
- k = (k >> n) | ((k & ((1 << n) - 1)) << (56 - n)); \
-} while (0)
+#define ror56_64(k, n) (k = (k >> n) | ((k & ((1 << n) - 1)) << (56 - n)))

/*
* Sboxes for Feistel network derived from
--
2.31.0

2021-04-02 09:48:43

by Herbert Xu

Subject: Re: [PATCH] crypto: fcrypt: Remove 'do while(0)' loop for single statement macro

On Fri, Mar 26, 2021 at 11:35:11AM -0700, Milan Djurovic wrote:
> Remove the 'do while(0)' loop in the macro, as it is not needed for single
> statement macros. Condense into one line.
>
> Signed-off-by: Milan Djurovic <[email protected]>
> ---
> crypto/fcrypt.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt