Merge tag 'asm-generic-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...

[uclinux-h8/linux.git] / crypto / chacha20poly1305.c

diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c
index fef1144..ed2e12e 100644 (file)
--- a/crypto/chacha20poly1305.c
+++ b/crypto/chacha20poly1305.c
@@ -701,37 +701,28 @@ static int rfc7539esp_create(struct crypto_template *tmpl, struct rtattr **tb)
        return chachapoly_create(tmpl, tb, "rfc7539esp", 8);
 }
 
-static struct crypto_template rfc7539_tmpl = {
-       .name = "rfc7539",
-       .create = rfc7539_create,
-       .module = THIS_MODULE,
-};
-
-static struct crypto_template rfc7539esp_tmpl = {
-       .name = "rfc7539esp",
-       .create = rfc7539esp_create,
-       .module = THIS_MODULE,
+static struct crypto_template rfc7539_tmpls[] = {
+       {
+               .name = "rfc7539",
+               .create = rfc7539_create,
+               .module = THIS_MODULE,
+       }, {
+               .name = "rfc7539esp",
+               .create = rfc7539esp_create,
+               .module = THIS_MODULE,
+       },
 };
 
 static int __init chacha20poly1305_module_init(void)
 {
-       int err;
-
-       err = crypto_register_template(&rfc7539_tmpl);
-       if (err)
-               return err;
-
-       err = crypto_register_template(&rfc7539esp_tmpl);
-       if (err)
-               crypto_unregister_template(&rfc7539_tmpl);
-
-       return err;
+       return crypto_register_templates(rfc7539_tmpls,
+                                        ARRAY_SIZE(rfc7539_tmpls));
 }
 
 static void __exit chacha20poly1305_module_exit(void)
 {
-       crypto_unregister_template(&rfc7539esp_tmpl);
-       crypto_unregister_template(&rfc7539_tmpl);
+       crypto_unregister_templates(rfc7539_tmpls,
+                                   ARRAY_SIZE(rfc7539_tmpls));
 }
 
 module_init(chacha20poly1305_module_init);