crypto: arm/aes-ce - cosmetic/whitespace cleanup

Rearrange the aes_algs[] array for legibility.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c
index 620aacf..e4139a0 100644 (file)
--- a/arch/arm/crypto/aes-ce-glue.c
+++ b/arch/arm/crypto/aes-ce-glue.c
@@ -334,69 +334,65 @@ static int xts_decrypt(struct skcipher_request *req)
 }
 
 static struct skcipher_alg aes_algs[] = { {
-       .base = {
-               .cra_name               = "__ecb(aes)",
-               .cra_driver_name        = "__ecb-aes-ce",
-               .cra_priority           = 300,
-               .cra_flags              = CRYPTO_ALG_INTERNAL,
-               .cra_blocksize          = AES_BLOCK_SIZE,
-               .cra_ctxsize            = sizeof(struct crypto_aes_ctx),
-               .cra_module             = THIS_MODULE,
-       },
-       .min_keysize    = AES_MIN_KEY_SIZE,
-       .max_keysize    = AES_MAX_KEY_SIZE,
-       .setkey         = ce_aes_setkey,
-       .encrypt        = ecb_encrypt,
-       .decrypt        = ecb_decrypt,
+       .base.cra_name          = "__ecb(aes)",
+       .base.cra_driver_name   = "__ecb-aes-ce",
+       .base.cra_priority      = 300,
+       .base.cra_flags         = CRYPTO_ALG_INTERNAL,
+       .base.cra_blocksize     = AES_BLOCK_SIZE,
+       .base.cra_ctxsize       = sizeof(struct crypto_aes_ctx),
+       .base.cra_module        = THIS_MODULE,
+
+       .min_keysize            = AES_MIN_KEY_SIZE,
+       .max_keysize            = AES_MAX_KEY_SIZE,
+       .setkey                 = ce_aes_setkey,
+       .encrypt                = ecb_encrypt,
+       .decrypt                = ecb_decrypt,
 }, {
-       .base = {
-               .cra_name               = "__cbc(aes)",
-               .cra_driver_name        = "__cbc-aes-ce",
-               .cra_priority           = 300,
-               .cra_flags              = CRYPTO_ALG_INTERNAL,
-               .cra_blocksize          = AES_BLOCK_SIZE,
-               .cra_ctxsize            = sizeof(struct crypto_aes_ctx),
-               .cra_module             = THIS_MODULE,
-       },
-       .min_keysize    = AES_MIN_KEY_SIZE,
-       .max_keysize    = AES_MAX_KEY_SIZE,
-       .ivsize         = AES_BLOCK_SIZE,
-       .setkey         = ce_aes_setkey,
-       .encrypt        = cbc_encrypt,
-       .decrypt        = cbc_decrypt,
+       .base.cra_name          = "__cbc(aes)",
+       .base.cra_driver_name   = "__cbc-aes-ce",
+       .base.cra_priority      = 300,
+       .base.cra_flags         = CRYPTO_ALG_INTERNAL,
+       .base.cra_blocksize     = AES_BLOCK_SIZE,
+       .base.cra_ctxsize       = sizeof(struct crypto_aes_ctx),
+       .base.cra_module        = THIS_MODULE,
+
+       .min_keysize            = AES_MIN_KEY_SIZE,
+       .max_keysize            = AES_MAX_KEY_SIZE,
+       .ivsize                 = AES_BLOCK_SIZE,
+       .setkey                 = ce_aes_setkey,
+       .encrypt                = cbc_encrypt,
+       .decrypt                = cbc_decrypt,
 }, {
-       .base = {
-               .cra_name               = "__ctr(aes)",
-               .cra_driver_name        = "__ctr-aes-ce",
-               .cra_priority           = 300,
-               .cra_flags              = CRYPTO_ALG_INTERNAL,
-               .cra_blocksize          = 1,
-               .cra_ctxsize            = sizeof(struct crypto_aes_ctx),
-               .cra_module             = THIS_MODULE,
-       },
-       .min_keysize    = AES_MIN_KEY_SIZE,
-       .max_keysize    = AES_MAX_KEY_SIZE,
-       .ivsize         = AES_BLOCK_SIZE,
-       .chunksize      = AES_BLOCK_SIZE,
-       .setkey         = ce_aes_setkey,
-       .encrypt        = ctr_encrypt,
-       .decrypt        = ctr_encrypt,
+       .base.cra_name          = "__ctr(aes)",
+       .base.cra_driver_name   = "__ctr-aes-ce",
+       .base.cra_priority      = 300,
+       .base.cra_flags         = CRYPTO_ALG_INTERNAL,
+       .base.cra_blocksize     = 1,
+       .base.cra_ctxsize       = sizeof(struct crypto_aes_ctx),
+       .base.cra_module        = THIS_MODULE,
+
+       .min_keysize            = AES_MIN_KEY_SIZE,
+       .max_keysize            = AES_MAX_KEY_SIZE,
+       .ivsize                 = AES_BLOCK_SIZE,
+       .chunksize              = AES_BLOCK_SIZE,
+       .setkey                 = ce_aes_setkey,
+       .encrypt                = ctr_encrypt,
+       .decrypt                = ctr_encrypt,
 }, {
-       .base = {
-               .cra_name               = "__xts(aes)",
-               .cra_driver_name        = "__xts-aes-ce",
-               .cra_priority           = 300,
-               .cra_flags              = CRYPTO_ALG_INTERNAL,
-               .cra_blocksize          = AES_BLOCK_SIZE,
-               .cra_ctxsize            = sizeof(struct crypto_aes_xts_ctx),
-               .cra_module             = THIS_MODULE,
-       },
-       .min_keysize    = 2 * AES_MIN_KEY_SIZE,
-       .max_keysize    = 2 * AES_MAX_KEY_SIZE,
-       .ivsize         = AES_BLOCK_SIZE,
-       .setkey         = xts_set_key,
-       .encrypt        = xts_encrypt,
-       .decrypt        = xts_decrypt,
+       .base.cra_name          = "__xts(aes)",
+       .base.cra_driver_name   = "__xts-aes-ce",
+       .base.cra_priority      = 300,
+       .base.cra_flags         = CRYPTO_ALG_INTERNAL,
+       .base.cra_blocksize     = AES_BLOCK_SIZE,
+       .base.cra_ctxsize       = sizeof(struct crypto_aes_xts_ctx),
+       .base.cra_module        = THIS_MODULE,
+
+       .min_keysize            = 2 * AES_MIN_KEY_SIZE,
+       .max_keysize            = 2 * AES_MAX_KEY_SIZE,
+       .ivsize                 = AES_BLOCK_SIZE,
+       .setkey                 = xts_set_key,
+       .encrypt                = xts_encrypt,
+       .decrypt                = xts_decrypt,
 } };
 
 static struct simd_skcipher_alg *aes_simd_algs[ARRAY_SIZE(aes_algs)];