crypto: nx - remove unused variables 'nx_driver_string' and 'nx_driver_version'

[linux-2.6-block.git] / crypto / aegis.h

diff --git a/crypto/aegis.h b/crypto/aegis.h
index 3308066ddde078c6a400889d50d7ef1e00e5a15f..6920ebe7767953c53261960f5e203aa8422c9359 100644 (file)
--- a/crypto/aegis.h
+++ b/crypto/aegis.h
@@ -24,34 +24,23 @@ union aegis_block {
 #define AEGIS_BLOCK_ALIGN (__alignof__(union aegis_block))
 #define AEGIS_ALIGNED(p) IS_ALIGNED((uintptr_t)p, AEGIS_BLOCK_ALIGN)
 
-static const union aegis_block crypto_aegis_const[2] = {
-       { .words64 = {
-               cpu_to_le64(U64_C(0x0d08050302010100)),
-               cpu_to_le64(U64_C(0x6279e99059372215)),
-       } },
-       { .words64 = {
-               cpu_to_le64(U64_C(0xf12fc26d55183ddb)),
-               cpu_to_le64(U64_C(0xdd28b57342311120)),
-       } },
-};
-
-static void crypto_aegis_block_xor(union aegis_block *dst,
-                                  const union aegis_block *src)
+static __always_inline void crypto_aegis_block_xor(union aegis_block *dst,
+                                                  const union aegis_block *src)
 {
        dst->words64[0] ^= src->words64[0];
        dst->words64[1] ^= src->words64[1];
 }
 
-static void crypto_aegis_block_and(union aegis_block *dst,
-                                  const union aegis_block *src)
+static __always_inline void crypto_aegis_block_and(union aegis_block *dst,
+                                                  const union aegis_block *src)
 {
        dst->words64[0] &= src->words64[0];
        dst->words64[1] &= src->words64[1];
 }
 
-static void crypto_aegis_aesenc(union aegis_block *dst,
-                               const union aegis_block *src,
-                               const union aegis_block *key)
+static __always_inline void crypto_aegis_aesenc(union aegis_block *dst,
+                                               const union aegis_block *src,
+                                               const union aegis_block *key)
 {
        const u8  *s  = src->bytes;
        const u32 *t = crypto_ft_tab[0];