| Message ID | 1419206988-27331-1-git-send-email-mathieu.poirier@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 21 December 2014 at 18:57, Jason Cooper <jason@lakedaemon.net> wrote: > Mathieu, > > On Sun, Dec 21, 2014 at 05:09:48PM -0700, mathieu.poirier@linaro.org wrote: >> From: Mathieu Poirier <mathieu.poirier@linaro.org> >> >> Fixing errors related to the usage of do {} while (0) loop >> in single statement macros, trailing semicolon in macros and >> trailing whitespace. > > Huh. iirc, I added those do {} while(0)s to keep checkpatch happy. > Either it's gotten smarter, or something is off. Checkpatch apparently changed it's mind. > > At any rate, the whole macro menagerie in here concerns me a bit and I'm > reluctant to change it until I have some time to refresh my memory on > what this code is doing. > > It would be helpful if you could give scripts/objdiff a try on the > before and after effects of your patch. If the object code doesn't > change, then we can be more confident that the patch is just style > changes. Please also check when SKEIN_UNROLL_* is set/unset. You got it. > > I really should put the patch series together to move this driver out of > staging. Then maybe folks will stop running checkpatch against it :-) > > thx, > > Jason. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/drivers/staging/skein/skein_block.c b/drivers/staging/skein/skein_block.c index 66261ab25c88..43a342372633 100644 --- a/drivers/staging/skein/skein_block.c +++ b/drivers/staging/skein/skein_block.c @@ -82,10 +82,7 @@ do { \ } while (0) #else /* looping version */ -#define R256(p0, p1, p2, p3, ROT, r_num) \ -do { \ - ROUND256(p0, p1, p2, p3, ROT, r_num); \ -} while (0) +#define R256(p0, p1, p2, p3, ROT, r_num) ROUND256(p0, p1, p2, p3, ROT, r_num) #define I256(R) \ do { \ @@ -174,9 +171,7 @@ do { \ #else /* looping version */ #define R512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ -do { \ - ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num); \ -} while (0) + ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) #define I512(R) \ do { \ @@ -263,10 +258,8 @@ do { \ #if SKEIN_UNROLL_1024 == 0 #define R1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, pF, \ ROT, rn) \ -do { \ ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, \ - pF, ROT, rn); \ -} while (0) + pF, ROT, rn) #define I1024(R) \ do { \ @@ -291,10 +284,8 @@ do { \ #else /* looping version */ #define R1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, pF, \ ROT, rn) \ -do { \ ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, \ - pF, ROT, rn); \ -} while (0) + pF, ROT, rn) #define I1024(R) \ do { \ diff --git a/drivers/staging/skein/skein_generic.c b/drivers/staging/skein/skein_generic.c index 85bd7d0168b0..899078f1b8bc 100644 --- a/drivers/staging/skein/skein_generic.c +++ b/drivers/staging/skein/skein_generic.c @@ -191,7 +191,6 @@ static int __init skein_generic_init(void) return 0; - unreg512: crypto_unregister_shash(&alg512); unreg256: