Merge remote-tracking branch 'lightnvm/for-next'

[deliverable/linux.git] / drivers / crypto / sunxi-ss / sun4i-ss-core.c

diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-core.c b/drivers/crypto/sunxi-ss/sun4i-ss-core.c
index 107cd2a41cae250025b43b5211c9a800f1d8f438..3ac6c6c4ad18e16c22aebe018f93ce3b5532b9c1 100644 (file)
--- a/drivers/crypto/sunxi-ss/sun4i-ss-core.c
+++ b/drivers/crypto/sunxi-ss/sun4i-ss-core.c
@@ -172,45 +172,45 @@ static struct sun4i_ss_alg_template ss_algs[] = {
 },
 {       .type = CRYPTO_ALG_TYPE_ABLKCIPHER,
        .alg.crypto = {
-                       .cra_name = "cbc(des3_ede)",
-                       .cra_driver_name = "cbc-des3-sun4i-ss",
-                       .cra_priority = 300,
-                       .cra_blocksize = DES3_EDE_BLOCK_SIZE,
-                       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER,
-                       .cra_ctxsize = sizeof(struct sun4i_req_ctx),
-                       .cra_module = THIS_MODULE,
-                       .cra_alignmask = 3,
-                       .cra_type = &crypto_ablkcipher_type,
-                       .cra_init = sun4i_ss_cipher_init,
-                       .cra_u.ablkcipher = {
-                               .min_keysize    = DES3_EDE_KEY_SIZE,
-                               .max_keysize    = DES3_EDE_KEY_SIZE,
-                               .ivsize         = DES3_EDE_BLOCK_SIZE,
-                               .setkey         = sun4i_ss_des3_setkey,
-                               .encrypt        = sun4i_ss_cbc_des3_encrypt,
-                               .decrypt        = sun4i_ss_cbc_des3_decrypt,
+               .cra_name = "cbc(des3_ede)",
+               .cra_driver_name = "cbc-des3-sun4i-ss",
+               .cra_priority = 300,
+               .cra_blocksize = DES3_EDE_BLOCK_SIZE,
+               .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER,
+               .cra_ctxsize = sizeof(struct sun4i_req_ctx),
+               .cra_module = THIS_MODULE,
+               .cra_alignmask = 3,
+               .cra_type = &crypto_ablkcipher_type,
+               .cra_init = sun4i_ss_cipher_init,
+               .cra_u.ablkcipher = {
+                       .min_keysize    = DES3_EDE_KEY_SIZE,
+                       .max_keysize    = DES3_EDE_KEY_SIZE,
+                       .ivsize         = DES3_EDE_BLOCK_SIZE,
+                       .setkey         = sun4i_ss_des3_setkey,
+                       .encrypt        = sun4i_ss_cbc_des3_encrypt,
+                       .decrypt        = sun4i_ss_cbc_des3_decrypt,
                }
        }
 },
 {       .type = CRYPTO_ALG_TYPE_ABLKCIPHER,
        .alg.crypto = {
-                       .cra_name = "ecb(des3_ede)",
-                       .cra_driver_name = "ecb-des3-sun4i-ss",
-                       .cra_priority = 300,
-                       .cra_blocksize = DES3_EDE_BLOCK_SIZE,
-                       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER,
-                       .cra_ctxsize = sizeof(struct sun4i_req_ctx),
-                       .cra_module = THIS_MODULE,
-                       .cra_alignmask = 3,
-                       .cra_type = &crypto_ablkcipher_type,
-                       .cra_init = sun4i_ss_cipher_init,
-                       .cra_u.ablkcipher = {
-                               .min_keysize    = DES3_EDE_KEY_SIZE,
-                               .max_keysize    = DES3_EDE_KEY_SIZE,
-                               .ivsize         = DES3_EDE_BLOCK_SIZE,
-                               .setkey         = sun4i_ss_des3_setkey,
-                               .encrypt        = sun4i_ss_ecb_des3_encrypt,
-                               .decrypt        = sun4i_ss_ecb_des3_decrypt,
+               .cra_name = "ecb(des3_ede)",
+               .cra_driver_name = "ecb-des3-sun4i-ss",
+               .cra_priority = 300,
+               .cra_blocksize = DES3_EDE_BLOCK_SIZE,
+               .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER,
+               .cra_ctxsize = sizeof(struct sun4i_req_ctx),
+               .cra_module = THIS_MODULE,
+               .cra_alignmask = 3,
+               .cra_type = &crypto_ablkcipher_type,
+               .cra_init = sun4i_ss_cipher_init,
+               .cra_u.ablkcipher = {
+                       .min_keysize    = DES3_EDE_KEY_SIZE,
+                       .max_keysize    = DES3_EDE_KEY_SIZE,
+                       .ivsize         = DES3_EDE_BLOCK_SIZE,
+                       .setkey         = sun4i_ss_des3_setkey,
+                       .encrypt        = sun4i_ss_ecb_des3_encrypt,
+                       .decrypt        = sun4i_ss_ecb_des3_decrypt,
                }
        }
 },