The original code defined macros in the source code, making it harder to read. Moved them to the header file, as per the TODO file. Updated the TODO file. Signed-off-by: Sanidhya Solanki <jpage.lkml@xxxxxxxxx> --- drivers/staging/skein/TODO | 1 - drivers/staging/skein/skein_block.c | 6 ------ drivers/staging/skein/skein_block.h | 7 +++++++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/skein/TODO b/drivers/staging/skein/TODO index cd3508d..e3de0c7 100644 --- a/drivers/staging/skein/TODO +++ b/drivers/staging/skein/TODO @@ -1,6 +1,5 @@ skein/threefish TODO - - move macros into appropriate header files - add / pass test vectors - module support diff --git a/drivers/staging/skein/skein_block.c b/drivers/staging/skein/skein_block.c index 45b4732..2120392 100644 --- a/drivers/staging/skein/skein_block.c +++ b/drivers/staging/skein/skein_block.c @@ -26,12 +26,6 @@ #define SKEIN_LOOP 001 /* default: unroll 256 and 512, but not 1024 */ #endif -#define BLK_BITS (WCNT * 64) /* some useful definitions for code here */ -#define KW_TWK_BASE (0) -#define KW_KEY_BASE (3) -#define ks (kw + KW_KEY_BASE) -#define ts (kw + KW_TWK_BASE) - #ifdef SKEIN_DEBUG #define debug_save_tweak(ctx) \ { \ diff --git a/drivers/staging/skein/skein_block.h b/drivers/staging/skein/skein_block.h index 9d40f4a..0fd4bfe 100644 --- a/drivers/staging/skein/skein_block.h +++ b/drivers/staging/skein/skein_block.h @@ -7,6 +7,13 @@ ** This algorithm and source code is released to the public domain. ** ************************************************************************/ + +#define BLK_BITS (WCNT * 64) /* some useful definitions for code here */ +#define KW_TWK_BASE (0) +#define KW_KEY_BASE (3) +#define ks (kw + KW_KEY_BASE) +#define ts (kw + KW_TWK_BASE) + #ifndef _SKEIN_BLOCK_H_ #define _SKEIN_BLOCK_H_ -- 2.5.0 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel