crypto: atmel - remove empty functions

Pointer members of an object with static storage duration, if not
explicitly initialized, will be initialized to a NULL pointer.
The crypto API checks if these pointers are not NULL before using them,
therefore we can safely remove these empty functions.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c
index 0b49b6e9869a9a04ec39e4ac065457d6fda861ec..691c6465b71eb77df7acfccc39ac5690a6617a73 100644 (file)
--- a/drivers/crypto/atmel-aes.c
+++ b/drivers/crypto/atmel-aes.c
@@ -1265,10 +1265,6 @@ static int atmel_aes_ctr_cra_init(struct crypto_tfm *tfm)
        return 0;
 }
 
-static void atmel_aes_cra_exit(struct crypto_tfm *tfm)
-{
-}
-
 static struct crypto_alg aes_algs[] = {
 {
        .cra_name               = "ecb(aes)",
@@ -1281,7 +1277,6 @@ static struct crypto_alg aes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_aes_cra_init,
-       .cra_exit               = atmel_aes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = AES_MIN_KEY_SIZE,
                .max_keysize    = AES_MAX_KEY_SIZE,
@@ -1301,7 +1296,6 @@ static struct crypto_alg aes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_aes_cra_init,
-       .cra_exit               = atmel_aes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = AES_MIN_KEY_SIZE,
                .max_keysize    = AES_MAX_KEY_SIZE,
@@ -1322,7 +1316,6 @@ static struct crypto_alg aes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_aes_cra_init,
-       .cra_exit               = atmel_aes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = AES_MIN_KEY_SIZE,
                .max_keysize    = AES_MAX_KEY_SIZE,
@@ -1343,7 +1336,6 @@ static struct crypto_alg aes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_aes_cra_init,
-       .cra_exit               = atmel_aes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = AES_MIN_KEY_SIZE,
                .max_keysize    = AES_MAX_KEY_SIZE,
@@ -1364,7 +1356,6 @@ static struct crypto_alg aes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_aes_cra_init,
-       .cra_exit               = atmel_aes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = AES_MIN_KEY_SIZE,
                .max_keysize    = AES_MAX_KEY_SIZE,
@@ -1385,7 +1376,6 @@ static struct crypto_alg aes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_aes_cra_init,
-       .cra_exit               = atmel_aes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = AES_MIN_KEY_SIZE,
                .max_keysize    = AES_MAX_KEY_SIZE,
@@ -1406,7 +1396,6 @@ static struct crypto_alg aes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_aes_cra_init,
-       .cra_exit               = atmel_aes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = AES_MIN_KEY_SIZE,
                .max_keysize    = AES_MAX_KEY_SIZE,
@@ -1427,7 +1416,6 @@ static struct crypto_alg aes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_aes_ctr_cra_init,
-       .cra_exit               = atmel_aes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = AES_MIN_KEY_SIZE,
                .max_keysize    = AES_MAX_KEY_SIZE,
@@ -1450,7 +1438,6 @@ static struct crypto_alg aes_cfb64_alg = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_aes_cra_init,
-       .cra_exit               = atmel_aes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = AES_MIN_KEY_SIZE,
                .max_keysize    = AES_MAX_KEY_SIZE,
@@ -1838,18 +1825,12 @@ static int atmel_aes_gcm_init(struct crypto_aead *tfm)
        return 0;
 }
 
-static void atmel_aes_gcm_exit(struct crypto_aead *tfm)
-{
-
-}
-
 static struct aead_alg aes_gcm_alg = {
        .setkey         = atmel_aes_gcm_setkey,
        .setauthsize    = atmel_aes_gcm_setauthsize,
        .encrypt        = atmel_aes_gcm_encrypt,
        .decrypt        = atmel_aes_gcm_decrypt,
        .init           = atmel_aes_gcm_init,
-       .exit           = atmel_aes_gcm_exit,
        .ivsize         = GCM_AES_IV_SIZE,
        .maxauthsize    = AES_BLOCK_SIZE,
 
@@ -1985,7 +1966,6 @@ static struct crypto_alg aes_xts_alg = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_aes_xts_cra_init,
-       .cra_exit               = atmel_aes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = 2 * AES_MIN_KEY_SIZE,
                .max_keysize    = 2 * AES_MAX_KEY_SIZE,

diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c
index 8587be54a74e8951104ab4fad9b349ccb3afe92a..592124f8382b6575d5200cbbd24a7d8e9c7a2eca 100644 (file)
--- a/drivers/crypto/atmel-tdes.c
+++ b/drivers/crypto/atmel-tdes.c
@@ -911,10 +911,6 @@ static int atmel_tdes_cra_init(struct crypto_tfm *tfm)
        return 0;
 }
 
-static void atmel_tdes_cra_exit(struct crypto_tfm *tfm)
-{
-}
-
 static struct crypto_alg tdes_algs[] = {
 {
        .cra_name               = "ecb(des)",
@@ -927,7 +923,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = DES_KEY_SIZE,
                .max_keysize    = DES_KEY_SIZE,
@@ -947,7 +942,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = DES_KEY_SIZE,
                .max_keysize    = DES_KEY_SIZE,
@@ -968,7 +962,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = DES_KEY_SIZE,
                .max_keysize    = DES_KEY_SIZE,
@@ -989,7 +982,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = DES_KEY_SIZE,
                .max_keysize    = DES_KEY_SIZE,
@@ -1010,7 +1002,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = DES_KEY_SIZE,
                .max_keysize    = DES_KEY_SIZE,
@@ -1031,7 +1022,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = DES_KEY_SIZE,
                .max_keysize    = DES_KEY_SIZE,
@@ -1052,7 +1042,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = DES_KEY_SIZE,
                .max_keysize    = DES_KEY_SIZE,
@@ -1073,7 +1062,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = 2 * DES_KEY_SIZE,
                .max_keysize    = 3 * DES_KEY_SIZE,
@@ -1093,7 +1081,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = 2*DES_KEY_SIZE,
                .max_keysize    = 3*DES_KEY_SIZE,
@@ -1114,7 +1101,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = 2*DES_KEY_SIZE,
                .max_keysize    = 2*DES_KEY_SIZE,
@@ -1135,7 +1121,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = 2*DES_KEY_SIZE,
                .max_keysize    = 2*DES_KEY_SIZE,
@@ -1156,7 +1141,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = 2*DES_KEY_SIZE,
                .max_keysize    = 2*DES_KEY_SIZE,
@@ -1177,7 +1161,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = 2*DES_KEY_SIZE,
                .max_keysize    = 2*DES_KEY_SIZE,
@@ -1198,7 +1181,6 @@ static struct crypto_alg tdes_algs[] = {
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
        .cra_init               = atmel_tdes_cra_init,
-       .cra_exit               = atmel_tdes_cra_exit,
        .cra_u.ablkcipher = {
                .min_keysize    = 2*DES_KEY_SIZE,
                .max_keysize    = 3*DES_KEY_SIZE,