From 3af5b90bde5000abc739996cb03fd718e753d053 Mon Sep 17 00:00:00 2001 From: Kamalesh Babulal Date: Sat, 5 Apr 2008 21:00:57 +0800 Subject: [PATCH] [CRYPTO] all: Clean up init()/fini() On Thu, Mar 27, 2008 at 03:40:36PM +0100, Bodo Eggert wrote: > Kamalesh Babulal wrote: > > > This patch cleanups the crypto code, replaces the init() and fini() > > with the _init/_fini > > This part ist OK. > > > or init/fini_ (if the > > _init/_fini exist) > > Having init_foo and foo_init won't be a good thing, will it? I'd start > confusing them. > > What about foo_modinit instead? Thanks for the suggestion, the init() is replaced with _mod_init () and fini () is replaced with _mod_fini. Signed-off-by: Kamalesh Babulal Signed-off-by: Herbert Xu --- crypto/anubis.c | 8 ++++---- crypto/blowfish.c | 8 ++++---- crypto/cast5.c | 8 ++++---- crypto/cast6.c | 8 ++++---- crypto/crc32c.c | 8 ++++---- crypto/crypto_null.c | 8 ++++---- crypto/deflate.c | 8 ++++---- crypto/des_generic.c | 8 ++++---- crypto/fcrypt.c | 8 ++++---- crypto/khazad.c | 8 ++++---- crypto/lzo.c | 8 ++++---- crypto/md4.c | 8 ++++---- crypto/md5.c | 8 ++++---- crypto/salsa20_generic.c | 8 ++++---- crypto/serpent.c | 8 ++++---- crypto/sha1_generic.c | 8 ++++---- crypto/sha256_generic.c | 8 ++++---- crypto/sha512_generic.c | 8 ++++---- crypto/tcrypt.c | 8 ++++---- crypto/tea.c | 8 ++++---- crypto/tgr192.c | 8 ++++---- crypto/twofish.c | 8 ++++---- crypto/wp512.c | 8 ++++---- 23 files changed, 92 insertions(+), 92 deletions(-) diff --git a/crypto/anubis.c b/crypto/anubis.c index 4ff0e1e243a..e42c3a8ba4a 100644 --- a/crypto/anubis.c +++ b/crypto/anubis.c @@ -687,7 +687,7 @@ static struct crypto_alg anubis_alg = { .cia_decrypt = anubis_decrypt } } }; -static int __init init(void) +static int __init anubis_mod_init(void) { int ret = 0; @@ -695,13 +695,13 @@ static int __init init(void) return ret; } -static void __exit fini(void) +static void __exit anubis_mod_fini(void) { crypto_unregister_alg(&anubis_alg); } -module_init(init); -module_exit(fini); +module_init(anubis_mod_init); +module_exit(anubis_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Anubis Cryptographic Algorithm"); diff --git a/crypto/blowfish.c b/crypto/blowfish.c index 80c3fd8be97..6f5b4873192 100644 --- a/crypto/blowfish.c +++ b/crypto/blowfish.c @@ -465,18 +465,18 @@ static struct crypto_alg alg = { .cia_decrypt = bf_decrypt } } }; -static int __init init(void) +static int __init blowfish_mod_init(void) { return crypto_register_alg(&alg); } -static void __exit fini(void) +static void __exit blowfish_mod_fini(void) { crypto_unregister_alg(&alg); } -module_init(init); -module_exit(fini); +module_init(blowfish_mod_init); +module_exit(blowfish_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Blowfish Cipher Algorithm"); diff --git a/crypto/cast5.c b/crypto/cast5.c index 13ea60abc19..8cbe28fa0e0 100644 --- a/crypto/cast5.c +++ b/crypto/cast5.c @@ -817,18 +817,18 @@ static struct crypto_alg alg = { } }; -static int __init init(void) +static int __init cast5_mod_init(void) { return crypto_register_alg(&alg); } -static void __exit fini(void) +static void __exit cast5_mod_fini(void) { crypto_unregister_alg(&alg); } -module_init(init); -module_exit(fini); +module_init(cast5_mod_init); +module_exit(cast5_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Cast5 Cipher Algorithm"); diff --git a/crypto/cast6.c b/crypto/cast6.c index 5fd9420dc58..007d02beed6 100644 --- a/crypto/cast6.c +++ b/crypto/cast6.c @@ -528,18 +528,18 @@ static struct crypto_alg alg = { } }; -static int __init init(void) +static int __init cast6_mod_init(void) { return crypto_register_alg(&alg); } -static void __exit fini(void) +static void __exit cast6_mod_fini(void) { crypto_unregister_alg(&alg); } -module_init(init); -module_exit(fini); +module_init(cast6_mod_init); +module_exit(cast6_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Cast6 Cipher Algorithm"); diff --git a/crypto/crc32c.c b/crypto/crc32c.c index 0fa744392a4..0dcf64a74e6 100644 --- a/crypto/crc32c.c +++ b/crypto/crc32c.c @@ -98,18 +98,18 @@ static struct crypto_alg alg = { } }; -static int __init init(void) +static int __init crc32c_mod_init(void) { return crypto_register_alg(&alg); } -static void __exit fini(void) +static void __exit crc32c_mod_fini(void) { crypto_unregister_alg(&alg); } -module_init(init); -module_exit(fini); +module_init(crc32c_mod_init); +module_exit(crc32c_mod_fini); MODULE_AUTHOR("Clay Haapala "); MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations wrapper for lib/crc32c"); diff --git a/crypto/crypto_null.c b/crypto/crypto_null.c index ff7b3de1bcf..1f7d53013a2 100644 --- a/crypto/crypto_null.c +++ b/crypto/crypto_null.c @@ -142,7 +142,7 @@ MODULE_ALIAS("compress_null"); MODULE_ALIAS("digest_null"); MODULE_ALIAS("cipher_null"); -static int __init init(void) +static int __init crypto_null_mod_init(void) { int ret = 0; @@ -174,7 +174,7 @@ out_unregister_cipher: goto out; } -static void __exit fini(void) +static void __exit crypto_null_mod_fini(void) { crypto_unregister_alg(&compress_null); crypto_unregister_alg(&digest_null); @@ -182,8 +182,8 @@ static void __exit fini(void) crypto_unregister_alg(&cipher_null); } -module_init(init); -module_exit(fini); +module_init(crypto_null_mod_init); +module_exit(crypto_null_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Null Cryptographic Algorithms"); diff --git a/crypto/deflate.c b/crypto/deflate.c index 6588bbf82e9..9128da44e95 100644 --- a/crypto/deflate.c +++ b/crypto/deflate.c @@ -208,18 +208,18 @@ static struct crypto_alg alg = { .coa_decompress = deflate_decompress } } }; -static int __init init(void) +static int __init deflate_mod_init(void) { return crypto_register_alg(&alg); } -static void __exit fini(void) +static void __exit deflate_mod_fini(void) { crypto_unregister_alg(&alg); } -module_init(init); -module_exit(fini); +module_init(deflate_mod_init); +module_exit(deflate_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Deflate Compression Algorithm for IPCOMP"); diff --git a/crypto/des_generic.c b/crypto/des_generic.c index 355ecb71cb0..5d0e4580f99 100644 --- a/crypto/des_generic.c +++ b/crypto/des_generic.c @@ -977,7 +977,7 @@ static struct crypto_alg des3_ede_alg = { MODULE_ALIAS("des3_ede"); -static int __init init(void) +static int __init des_generic_mod_init(void) { int ret = 0; @@ -992,14 +992,14 @@ out: return ret; } -static void __exit fini(void) +static void __exit des_generic_mod_fini(void) { crypto_unregister_alg(&des3_ede_alg); crypto_unregister_alg(&des_alg); } -module_init(init); -module_exit(fini); +module_init(des_generic_mod_init); +module_exit(des_generic_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms"); diff --git a/crypto/fcrypt.c b/crypto/fcrypt.c index a32cb68bbc6..1302f4cae33 100644 --- a/crypto/fcrypt.c +++ b/crypto/fcrypt.c @@ -405,18 +405,18 @@ static struct crypto_alg fcrypt_alg = { .cia_decrypt = fcrypt_decrypt } } }; -static int __init init(void) +static int __init fcrypt_mod_init(void) { return crypto_register_alg(&fcrypt_alg); } -static void __exit fini(void) +static void __exit fcrypt_mod_fini(void) { crypto_unregister_alg(&fcrypt_alg); } -module_init(init); -module_exit(fini); +module_init(fcrypt_mod_init); +module_exit(fcrypt_mod_fini); MODULE_LICENSE("Dual BSD/GPL"); MODULE_DESCRIPTION("FCrypt Cipher Algorithm"); diff --git a/crypto/khazad.c b/crypto/khazad.c index 704ebfe26b5..527e4e395fc 100644 --- a/crypto/khazad.c +++ b/crypto/khazad.c @@ -862,7 +862,7 @@ static struct crypto_alg khazad_alg = { .cia_decrypt = khazad_decrypt } } }; -static int __init init(void) +static int __init khazad_mod_init(void) { int ret = 0; @@ -870,14 +870,14 @@ static int __init init(void) return ret; } -static void __exit fini(void) +static void __exit khazad_mod_fini(void) { crypto_unregister_alg(&khazad_alg); } -module_init(init); -module_exit(fini); +module_init(khazad_mod_init); +module_exit(khazad_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Khazad Cryptographic Algorithm"); diff --git a/crypto/lzo.c b/crypto/lzo.c index 48c32883f02..b5e77077d75 100644 --- a/crypto/lzo.c +++ b/crypto/lzo.c @@ -89,18 +89,18 @@ static struct crypto_alg alg = { .coa_decompress = lzo_decompress } } }; -static int __init init(void) +static int __init lzo_mod_init(void) { return crypto_register_alg(&alg); } -static void __exit fini(void) +static void __exit lzo_mod_fini(void) { crypto_unregister_alg(&alg); } -module_init(init); -module_exit(fini); +module_init(lzo_mod_init); +module_exit(lzo_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("LZO Compression Algorithm"); diff --git a/crypto/md4.c b/crypto/md4.c index c1bc71bdc16..3c19aa0750f 100644 --- a/crypto/md4.c +++ b/crypto/md4.c @@ -233,18 +233,18 @@ static struct crypto_alg alg = { .dia_final = md4_final } } }; -static int __init init(void) +static int __init md4_mod_init(void) { return crypto_register_alg(&alg); } -static void __exit fini(void) +static void __exit md4_mod_fini(void) { crypto_unregister_alg(&alg); } -module_init(init); -module_exit(fini); +module_init(md4_mod_init); +module_exit(md4_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("MD4 Message Digest Algorithm"); diff --git a/crypto/md5.c b/crypto/md5.c index 93d18e8b3d5..39268f3d2f1 100644 --- a/crypto/md5.c +++ b/crypto/md5.c @@ -228,18 +228,18 @@ static struct crypto_alg alg = { .dia_final = md5_final } } }; -static int __init init(void) +static int __init md5_mod_init(void) { return crypto_register_alg(&alg); } -static void __exit fini(void) +static void __exit md5_mod_fini(void) { crypto_unregister_alg(&alg); } -module_init(init); -module_exit(fini); +module_init(md5_mod_init); +module_exit(md5_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("MD5 Message Digest Algorithm"); diff --git a/crypto/salsa20_generic.c b/crypto/salsa20_generic.c index 1fa4e4ddcab..b07d5598174 100644 --- a/crypto/salsa20_generic.c +++ b/crypto/salsa20_generic.c @@ -237,18 +237,18 @@ static struct crypto_alg alg = { } }; -static int __init init(void) +static int __init salsa20_generic_mod_init(void) { return crypto_register_alg(&alg); } -static void __exit fini(void) +static void __exit salsa20_generic_mod_fini(void) { crypto_unregister_alg(&alg); } -module_init(init); -module_exit(fini); +module_init(salsa20_generic_mod_init); +module_exit(salsa20_generic_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION ("Salsa20 stream cipher algorithm"); diff --git a/crypto/serpent.c b/crypto/serpent.c index 2b0a19a44ec..b651a55fa56 100644 --- a/crypto/serpent.c +++ b/crypto/serpent.c @@ -557,7 +557,7 @@ static struct crypto_alg tnepres_alg = { .cia_decrypt = tnepres_decrypt } } }; -static int __init init(void) +static int __init serpent_mod_init(void) { int ret = crypto_register_alg(&serpent_alg); @@ -572,14 +572,14 @@ static int __init init(void) return ret; } -static void __exit fini(void) +static void __exit serpent_mod_fini(void) { crypto_unregister_alg(&tnepres_alg); crypto_unregister_alg(&serpent_alg); } -module_init(init); -module_exit(fini); +module_init(serpent_mod_init); +module_exit(serpent_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Serpent and tnepres (kerneli compatible serpent reversed) Cipher Algorithm"); diff --git a/crypto/sha1_generic.c b/crypto/sha1_generic.c index 68c62f528eb..c7c6899e1fc 100644 --- a/crypto/sha1_generic.c +++ b/crypto/sha1_generic.c @@ -120,18 +120,18 @@ static struct crypto_alg alg = { .dia_final = sha1_final } } }; -static int __init init(void) +static int __init sha1_generic_mod_init(void) { return crypto_register_alg(&alg); } -static void __exit fini(void) +static void __exit sha1_generic_mod_fini(void) { crypto_unregister_alg(&alg); } -module_init(init); -module_exit(fini); +module_init(sha1_generic_mod_init); +module_exit(sha1_generic_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm"); diff --git a/crypto/sha256_generic.c b/crypto/sha256_generic.c index 3cc93fd6104..5a8dd47558e 100644 --- a/crypto/sha256_generic.c +++ b/crypto/sha256_generic.c @@ -353,7 +353,7 @@ static struct crypto_alg sha224 = { .dia_final = sha224_final } } }; -static int __init init(void) +static int __init sha256_generic_mod_init(void) { int ret = 0; @@ -370,14 +370,14 @@ static int __init init(void) return ret; } -static void __exit fini(void) +static void __exit sha256_generic_mod_fini(void) { crypto_unregister_alg(&sha224); crypto_unregister_alg(&sha256); } -module_init(init); -module_exit(fini); +module_init(sha256_generic_mod_init); +module_exit(sha256_generic_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SHA-224 and SHA-256 Secure Hash Algorithm"); diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c index 82add4bf329..bc3686138ae 100644 --- a/crypto/sha512_generic.c +++ b/crypto/sha512_generic.c @@ -278,7 +278,7 @@ static struct crypto_alg sha384 = { } }; -static int __init init(void) +static int __init sha512_generic_mod_init(void) { int ret = 0; @@ -290,14 +290,14 @@ out: return ret; } -static void __exit fini(void) +static void __exit sha512_generic_mod_fini(void) { crypto_unregister_alg(&sha384); crypto_unregister_alg(&sha512); } -module_init(init); -module_exit(fini); +module_init(sha512_generic_mod_init); +module_exit(sha512_generic_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SHA-512 and SHA-384 Secure Hash Algorithms"); diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 689482cd16c..6beabc5abd0 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -1810,7 +1810,7 @@ static void do_test(void) } } -static int __init init(void) +static int __init tcrypt_mod_init(void) { int err = -ENOMEM; @@ -1849,10 +1849,10 @@ static int __init init(void) * If an init function is provided, an exit function must also be provided * to allow module unload. */ -static void __exit fini(void) { } +static void __exit tcrypt_mod_fini(void) { } -module_init(init); -module_exit(fini); +module_init(tcrypt_mod_init); +module_exit(tcrypt_mod_fini); module_param(mode, int, 0); module_param(sec, uint, 0); diff --git a/crypto/tea.c b/crypto/tea.c index 6893b3fdf9d..412bc74f817 100644 --- a/crypto/tea.c +++ b/crypto/tea.c @@ -267,7 +267,7 @@ static struct crypto_alg xeta_alg = { .cia_decrypt = xeta_decrypt } } }; -static int __init init(void) +static int __init tea_mod_init(void) { int ret = 0; @@ -292,7 +292,7 @@ out: return ret; } -static void __exit fini(void) +static void __exit tea_mod_fini(void) { crypto_unregister_alg(&tea_alg); crypto_unregister_alg(&xtea_alg); @@ -302,8 +302,8 @@ static void __exit fini(void) MODULE_ALIAS("xtea"); MODULE_ALIAS("xeta"); -module_init(init); -module_exit(fini); +module_init(tea_mod_init); +module_exit(tea_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("TEA, XTEA & XETA Cryptographic Algorithms"); diff --git a/crypto/tgr192.c b/crypto/tgr192.c index 2e7ea1680c7..a92414f24be 100644 --- a/crypto/tgr192.c +++ b/crypto/tgr192.c @@ -663,7 +663,7 @@ static struct crypto_alg tgr128 = { .dia_final = tgr128_final}} }; -static int __init init(void) +static int __init tgr192_mod_init(void) { int ret = 0; @@ -688,7 +688,7 @@ static int __init init(void) return ret; } -static void __exit fini(void) +static void __exit tgr192_mod_fini(void) { crypto_unregister_alg(&tgr192); crypto_unregister_alg(&tgr160); @@ -698,8 +698,8 @@ static void __exit fini(void) MODULE_ALIAS("tgr160"); MODULE_ALIAS("tgr128"); -module_init(init); -module_exit(fini); +module_init(tgr192_mod_init); +module_exit(tgr192_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Tiger Message Digest Algorithm"); diff --git a/crypto/twofish.c b/crypto/twofish.c index 4979a2be48a..dfcda231f87 100644 --- a/crypto/twofish.c +++ b/crypto/twofish.c @@ -197,18 +197,18 @@ static struct crypto_alg alg = { .cia_decrypt = twofish_decrypt } } }; -static int __init init(void) +static int __init twofish_mod_init(void) { return crypto_register_alg(&alg); } -static void __exit fini(void) +static void __exit twofish_mod_fini(void) { crypto_unregister_alg(&alg); } -module_init(init); -module_exit(fini); +module_init(twofish_mod_init); +module_exit(twofish_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION ("Twofish Cipher Algorithm"); diff --git a/crypto/wp512.c b/crypto/wp512.c index f746952b93f..bff28560d66 100644 --- a/crypto/wp512.c +++ b/crypto/wp512.c @@ -1146,7 +1146,7 @@ static struct crypto_alg wp256 = { .dia_final = wp256_final } } }; -static int __init init(void) +static int __init wp512_mod_init(void) { int ret = 0; @@ -1172,7 +1172,7 @@ out: return ret; } -static void __exit fini(void) +static void __exit wp512_mod_fini(void) { crypto_unregister_alg(&wp512); crypto_unregister_alg(&wp384); @@ -1182,8 +1182,8 @@ static void __exit fini(void) MODULE_ALIAS("wp384"); MODULE_ALIAS("wp256"); -module_init(init); -module_exit(fini); +module_init(wp512_mod_init); +module_exit(wp512_mod_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Whirlpool Message Digest Algorithm"); -- 2.20.1