Commit d4165590 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu

crypto: remove useless initializations of cra_list

Some algorithms initialize their .cra_list prior to registration.
But this is unnecessary since crypto_register_alg() will overwrite
.cra_list when adding the algorithm to the 'crypto_alg_list'.
Apparently the useless assignment has just been copy+pasted around.

So, remove the useless assignments.

Exception: paes_s390.c uses cra_list to check whether the algorithm is
registered or not, so I left that as-is for now.

This patch shouldn't change any actual behavior.
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2b78aeb3
...@@ -476,11 +476,6 @@ static bool __init sparc64_has_aes_opcode(void) ...@@ -476,11 +476,6 @@ static bool __init sparc64_has_aes_opcode(void)
static int __init aes_sparc64_mod_init(void) static int __init aes_sparc64_mod_init(void)
{ {
int i;
for (i = 0; i < ARRAY_SIZE(algs); i++)
INIT_LIST_HEAD(&algs[i].cra_list);
if (sparc64_has_aes_opcode()) { if (sparc64_has_aes_opcode()) {
pr_info("Using sparc64 aes opcodes optimized AES implementation\n"); pr_info("Using sparc64 aes opcodes optimized AES implementation\n");
return crypto_register_algs(algs, ARRAY_SIZE(algs)); return crypto_register_algs(algs, ARRAY_SIZE(algs));
......
...@@ -299,11 +299,6 @@ static bool __init sparc64_has_camellia_opcode(void) ...@@ -299,11 +299,6 @@ static bool __init sparc64_has_camellia_opcode(void)
static int __init camellia_sparc64_mod_init(void) static int __init camellia_sparc64_mod_init(void)
{ {
int i;
for (i = 0; i < ARRAY_SIZE(algs); i++)
INIT_LIST_HEAD(&algs[i].cra_list);
if (sparc64_has_camellia_opcode()) { if (sparc64_has_camellia_opcode()) {
pr_info("Using sparc64 camellia opcodes optimized CAMELLIA implementation\n"); pr_info("Using sparc64 camellia opcodes optimized CAMELLIA implementation\n");
return crypto_register_algs(algs, ARRAY_SIZE(algs)); return crypto_register_algs(algs, ARRAY_SIZE(algs));
......
...@@ -510,11 +510,6 @@ static bool __init sparc64_has_des_opcode(void) ...@@ -510,11 +510,6 @@ static bool __init sparc64_has_des_opcode(void)
static int __init des_sparc64_mod_init(void) static int __init des_sparc64_mod_init(void)
{ {
int i;
for (i = 0; i < ARRAY_SIZE(algs); i++)
INIT_LIST_HEAD(&algs[i].cra_list);
if (sparc64_has_des_opcode()) { if (sparc64_has_des_opcode()) {
pr_info("Using sparc64 des opcodes optimized DES implementation\n"); pr_info("Using sparc64 des opcodes optimized DES implementation\n");
return crypto_register_algs(algs, ARRAY_SIZE(algs)); return crypto_register_algs(algs, ARRAY_SIZE(algs));
......
...@@ -122,7 +122,6 @@ static struct crypto_alg alg_lz4 = { ...@@ -122,7 +122,6 @@ static struct crypto_alg alg_lz4 = {
.cra_flags = CRYPTO_ALG_TYPE_COMPRESS, .cra_flags = CRYPTO_ALG_TYPE_COMPRESS,
.cra_ctxsize = sizeof(struct lz4_ctx), .cra_ctxsize = sizeof(struct lz4_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_list = LIST_HEAD_INIT(alg_lz4.cra_list),
.cra_init = lz4_init, .cra_init = lz4_init,
.cra_exit = lz4_exit, .cra_exit = lz4_exit,
.cra_u = { .compress = { .cra_u = { .compress = {
......
...@@ -123,7 +123,6 @@ static struct crypto_alg alg_lz4hc = { ...@@ -123,7 +123,6 @@ static struct crypto_alg alg_lz4hc = {
.cra_flags = CRYPTO_ALG_TYPE_COMPRESS, .cra_flags = CRYPTO_ALG_TYPE_COMPRESS,
.cra_ctxsize = sizeof(struct lz4hc_ctx), .cra_ctxsize = sizeof(struct lz4hc_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_list = LIST_HEAD_INIT(alg_lz4hc.cra_list),
.cra_init = lz4hc_init, .cra_init = lz4hc_init,
.cra_exit = lz4hc_exit, .cra_exit = lz4hc_exit,
.cra_u = { .compress = { .cra_u = { .compress = {
......
...@@ -4605,7 +4605,6 @@ static int spu_register_ablkcipher(struct iproc_alg_s *driver_alg) ...@@ -4605,7 +4605,6 @@ static int spu_register_ablkcipher(struct iproc_alg_s *driver_alg)
crypto->cra_priority = cipher_pri; crypto->cra_priority = cipher_pri;
crypto->cra_alignmask = 0; crypto->cra_alignmask = 0;
crypto->cra_ctxsize = sizeof(struct iproc_ctx_s); crypto->cra_ctxsize = sizeof(struct iproc_ctx_s);
INIT_LIST_HEAD(&crypto->cra_list);
crypto->cra_init = ablkcipher_cra_init; crypto->cra_init = ablkcipher_cra_init;
crypto->cra_exit = generic_cra_exit; crypto->cra_exit = generic_cra_exit;
...@@ -4691,7 +4690,6 @@ static int spu_register_aead(struct iproc_alg_s *driver_alg) ...@@ -4691,7 +4690,6 @@ static int spu_register_aead(struct iproc_alg_s *driver_alg)
aead->base.cra_priority = aead_pri; aead->base.cra_priority = aead_pri;
aead->base.cra_alignmask = 0; aead->base.cra_alignmask = 0;
aead->base.cra_ctxsize = sizeof(struct iproc_ctx_s); aead->base.cra_ctxsize = sizeof(struct iproc_ctx_s);
INIT_LIST_HEAD(&aead->base.cra_list);
aead->base.cra_flags |= CRYPTO_ALG_ASYNC; aead->base.cra_flags |= CRYPTO_ALG_ASYNC;
/* setkey set in alg initialization */ /* setkey set in alg initialization */
......
...@@ -1222,7 +1222,6 @@ static int omap_aes_probe(struct platform_device *pdev) ...@@ -1222,7 +1222,6 @@ static int omap_aes_probe(struct platform_device *pdev)
algp = &dd->pdata->algs_info[i].algs_list[j]; algp = &dd->pdata->algs_info[i].algs_list[j];
pr_debug("reg alg: %s\n", algp->cra_name); pr_debug("reg alg: %s\n", algp->cra_name);
INIT_LIST_HEAD(&algp->cra_list);
err = crypto_register_alg(algp); err = crypto_register_alg(algp);
if (err) if (err)
...@@ -1240,7 +1239,6 @@ static int omap_aes_probe(struct platform_device *pdev) ...@@ -1240,7 +1239,6 @@ static int omap_aes_probe(struct platform_device *pdev)
algp = &aalg->base; algp = &aalg->base;
pr_debug("reg alg: %s\n", algp->cra_name); pr_debug("reg alg: %s\n", algp->cra_name);
INIT_LIST_HEAD(&algp->cra_list);
err = crypto_register_aead(aalg); err = crypto_register_aead(aalg);
if (err) if (err)
......
...@@ -1069,7 +1069,6 @@ static int omap_des_probe(struct platform_device *pdev) ...@@ -1069,7 +1069,6 @@ static int omap_des_probe(struct platform_device *pdev)
algp = &dd->pdata->algs_info[i].algs_list[j]; algp = &dd->pdata->algs_info[i].algs_list[j];
pr_debug("reg alg: %s\n", algp->cra_name); pr_debug("reg alg: %s\n", algp->cra_name);
INIT_LIST_HEAD(&algp->cra_list);
err = crypto_register_alg(algp); err = crypto_register_alg(algp);
if (err) if (err)
......
...@@ -376,7 +376,6 @@ static int qce_ablkcipher_register_one(const struct qce_ablkcipher_def *def, ...@@ -376,7 +376,6 @@ static int qce_ablkcipher_register_one(const struct qce_ablkcipher_def *def,
alg->cra_module = THIS_MODULE; alg->cra_module = THIS_MODULE;
alg->cra_init = qce_ablkcipher_init; alg->cra_init = qce_ablkcipher_init;
alg->cra_exit = qce_ablkcipher_exit; alg->cra_exit = qce_ablkcipher_exit;
INIT_LIST_HEAD(&alg->cra_list);
INIT_LIST_HEAD(&tmpl->entry); INIT_LIST_HEAD(&tmpl->entry);
tmpl->crypto_alg_type = CRYPTO_ALG_TYPE_ABLKCIPHER; tmpl->crypto_alg_type = CRYPTO_ALG_TYPE_ABLKCIPHER;
......
...@@ -508,7 +508,6 @@ static int qce_ahash_register_one(const struct qce_ahash_def *def, ...@@ -508,7 +508,6 @@ static int qce_ahash_register_one(const struct qce_ahash_def *def,
base->cra_alignmask = 0; base->cra_alignmask = 0;
base->cra_module = THIS_MODULE; base->cra_module = THIS_MODULE;
base->cra_init = qce_ahash_cra_init; base->cra_init = qce_ahash_cra_init;
INIT_LIST_HEAD(&base->cra_list);
snprintf(base->cra_name, CRYPTO_MAX_ALG_NAME, "%s", def->name); snprintf(base->cra_name, CRYPTO_MAX_ALG_NAME, "%s", def->name);
snprintf(base->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s", snprintf(base->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
......
...@@ -1321,7 +1321,6 @@ static int sahara_register_algs(struct sahara_dev *dev) ...@@ -1321,7 +1321,6 @@ static int sahara_register_algs(struct sahara_dev *dev)
unsigned int i, j, k, l; unsigned int i, j, k, l;
for (i = 0; i < ARRAY_SIZE(aes_algs); i++) { for (i = 0; i < ARRAY_SIZE(aes_algs); i++) {
INIT_LIST_HEAD(&aes_algs[i].cra_list);
err = crypto_register_alg(&aes_algs[i]); err = crypto_register_alg(&aes_algs[i]);
if (err) if (err)
goto err_aes_algs; goto err_aes_algs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment