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.li...@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 <ja...@lakedaemon.net>
Make sure to include the staging ml and gregkh on the resend.
thx,
Jason.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
