tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

crypto: drivers - remove cra_list initialization

Initialization of cra_list is currently mixed, most ciphers initialize this
field and most shashes do not. Initialization however is not needed at all
since cra_list is initialized/overwritten in __crypto_register_alg() with
list_add(). Therefore perform cleanup to remove all unneeded initializations
of this field in 'crypto/drivers/'.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linux-geode@lists.infradead.org
Cc: Michal Ludvig <michal@logix.cz>
Cc: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Cc: Varun Wadekar <vwadekar@nvidia.com>
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Acked-by: Kent Yoder <key@linux.vnet.ibm.com>
Acked-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Jussi Kivilinna and committed by
Herbert Xu e15aa369 7af6c245

-21
-2
drivers/crypto/atmel-aes.c
··· 1017 1017 int err, i, j; 1018 1018 1019 1019 for (i = 0; i < ARRAY_SIZE(aes_algs); i++) { 1020 - INIT_LIST_HEAD(&aes_algs[i].cra_list); 1021 1020 err = crypto_register_alg(&aes_algs[i]); 1022 1021 if (err) 1023 1022 goto err_aes_algs; ··· 1025 1026 atmel_aes_hw_version_init(dd); 1026 1027 1027 1028 if (dd->hw_version >= 0x130) { 1028 - INIT_LIST_HEAD(&aes_cfb64_alg[0].cra_list); 1029 1029 err = crypto_register_alg(&aes_cfb64_alg[0]); 1030 1030 if (err) 1031 1031 goto err_aes_cfb64_alg;
-1
drivers/crypto/atmel-tdes.c
··· 1044 1044 int err, i, j; 1045 1045 1046 1046 for (i = 0; i < ARRAY_SIZE(tdes_algs); i++) { 1047 - INIT_LIST_HEAD(&tdes_algs[i].cra_list); 1048 1047 err = crypto_register_alg(&tdes_algs[i]); 1049 1048 if (err) 1050 1049 goto err_tdes_algs;
-3
drivers/crypto/geode-aes.c
··· 289 289 .cra_blocksize = AES_MIN_BLOCK_SIZE, 290 290 .cra_ctxsize = sizeof(struct geode_aes_op), 291 291 .cra_module = THIS_MODULE, 292 - .cra_list = LIST_HEAD_INIT(geode_alg.cra_list), 293 292 .cra_u = { 294 293 .cipher = { 295 294 .cia_min_keysize = AES_MIN_KEY_SIZE, ··· 401 402 .cra_alignmask = 15, 402 403 .cra_type = &crypto_blkcipher_type, 403 404 .cra_module = THIS_MODULE, 404 - .cra_list = LIST_HEAD_INIT(geode_cbc_alg.cra_list), 405 405 .cra_u = { 406 406 .blkcipher = { 407 407 .min_keysize = AES_MIN_KEY_SIZE, ··· 487 489 .cra_alignmask = 15, 488 490 .cra_type = &crypto_blkcipher_type, 489 491 .cra_module = THIS_MODULE, 490 - .cra_list = LIST_HEAD_INIT(geode_ecb_alg.cra_list), 491 492 .cra_u = { 492 493 .blkcipher = { 493 494 .min_keysize = AES_MIN_KEY_SIZE,
-1
drivers/crypto/nx/nx-aes-cbc.c
··· 127 127 .cra_ctxsize = sizeof(struct nx_crypto_ctx), 128 128 .cra_type = &crypto_blkcipher_type, 129 129 .cra_module = THIS_MODULE, 130 - .cra_list = LIST_HEAD_INIT(nx_cbc_aes_alg.cra_list), 131 130 .cra_init = nx_crypto_ctx_aes_cbc_init, 132 131 .cra_exit = nx_crypto_ctx_exit, 133 132 .cra_blkcipher = {
-2
drivers/crypto/nx/nx-aes-ccm.c
··· 430 430 .cra_ctxsize = sizeof(struct nx_crypto_ctx), 431 431 .cra_type = &crypto_aead_type, 432 432 .cra_module = THIS_MODULE, 433 - .cra_list = LIST_HEAD_INIT(nx_ccm_aes_alg.cra_list), 434 433 .cra_init = nx_crypto_ctx_aes_ccm_init, 435 434 .cra_exit = nx_crypto_ctx_exit, 436 435 .cra_aead = { ··· 452 453 .cra_ctxsize = sizeof(struct nx_crypto_ctx), 453 454 .cra_type = &crypto_nivaead_type, 454 455 .cra_module = THIS_MODULE, 455 - .cra_list = LIST_HEAD_INIT(nx_ccm4309_aes_alg.cra_list), 456 456 .cra_init = nx_crypto_ctx_aes_ccm_init, 457 457 .cra_exit = nx_crypto_ctx_exit, 458 458 .cra_aead = {
-2
drivers/crypto/nx/nx-aes-ctr.c
··· 141 141 .cra_ctxsize = sizeof(struct nx_crypto_ctx), 142 142 .cra_type = &crypto_blkcipher_type, 143 143 .cra_module = THIS_MODULE, 144 - .cra_list = LIST_HEAD_INIT(nx_ctr_aes_alg.cra_list), 145 144 .cra_init = nx_crypto_ctx_aes_ctr_init, 146 145 .cra_exit = nx_crypto_ctx_exit, 147 146 .cra_blkcipher = { ··· 162 163 .cra_ctxsize = sizeof(struct nx_crypto_ctx), 163 164 .cra_type = &crypto_blkcipher_type, 164 165 .cra_module = THIS_MODULE, 165 - .cra_list = LIST_HEAD_INIT(nx_ctr3686_aes_alg.cra_list), 166 166 .cra_init = nx_crypto_ctx_aes_ctr_init, 167 167 .cra_exit = nx_crypto_ctx_exit, 168 168 .cra_blkcipher = {
-1
drivers/crypto/nx/nx-aes-ecb.c
··· 126 126 .cra_ctxsize = sizeof(struct nx_crypto_ctx), 127 127 .cra_type = &crypto_blkcipher_type, 128 128 .cra_module = THIS_MODULE, 129 - .cra_list = LIST_HEAD_INIT(nx_ecb_aes_alg.cra_list), 130 129 .cra_init = nx_crypto_ctx_aes_ecb_init, 131 130 .cra_exit = nx_crypto_ctx_exit, 132 131 .cra_blkcipher = {
-2
drivers/crypto/nx/nx-aes-gcm.c
··· 316 316 .cra_ctxsize = sizeof(struct nx_crypto_ctx), 317 317 .cra_type = &crypto_aead_type, 318 318 .cra_module = THIS_MODULE, 319 - .cra_list = LIST_HEAD_INIT(nx_gcm_aes_alg.cra_list), 320 319 .cra_init = nx_crypto_ctx_aes_gcm_init, 321 320 .cra_exit = nx_crypto_ctx_exit, 322 321 .cra_aead = { ··· 337 338 .cra_ctxsize = sizeof(struct nx_crypto_ctx), 338 339 .cra_type = &crypto_nivaead_type, 339 340 .cra_module = THIS_MODULE, 340 - .cra_list = LIST_HEAD_INIT(nx_gcm4106_aes_alg.cra_list), 341 341 .cra_init = nx_crypto_ctx_aes_gcm_init, 342 342 .cra_exit = nx_crypto_ctx_exit, 343 343 .cra_aead = {
-1
drivers/crypto/omap-aes.c
··· 876 876 877 877 for (i = 0; i < ARRAY_SIZE(algs); i++) { 878 878 pr_debug("i: %d\n", i); 879 - INIT_LIST_HEAD(&algs[i].cra_list); 880 879 err = crypto_register_alg(&algs[i]); 881 880 if (err) 882 881 goto err_algs;
-3
drivers/crypto/padlock-aes.c
··· 328 328 .cra_ctxsize = sizeof(struct aes_ctx), 329 329 .cra_alignmask = PADLOCK_ALIGNMENT - 1, 330 330 .cra_module = THIS_MODULE, 331 - .cra_list = LIST_HEAD_INIT(aes_alg.cra_list), 332 331 .cra_u = { 333 332 .cipher = { 334 333 .cia_min_keysize = AES_MIN_KEY_SIZE, ··· 407 408 .cra_alignmask = PADLOCK_ALIGNMENT - 1, 408 409 .cra_type = &crypto_blkcipher_type, 409 410 .cra_module = THIS_MODULE, 410 - .cra_list = LIST_HEAD_INIT(ecb_aes_alg.cra_list), 411 411 .cra_u = { 412 412 .blkcipher = { 413 413 .min_keysize = AES_MIN_KEY_SIZE, ··· 489 491 .cra_alignmask = PADLOCK_ALIGNMENT - 1, 490 492 .cra_type = &crypto_blkcipher_type, 491 493 .cra_module = THIS_MODULE, 492 - .cra_list = LIST_HEAD_INIT(cbc_aes_alg.cra_list), 493 494 .cra_u = { 494 495 .blkcipher = { 495 496 .min_keysize = AES_MIN_KEY_SIZE,
-1
drivers/crypto/s5p-sss.c
··· 626 626 crypto_init_queue(&pdata->queue, CRYPTO_QUEUE_LEN); 627 627 628 628 for (i = 0; i < ARRAY_SIZE(algs); i++) { 629 - INIT_LIST_HEAD(&algs[i].cra_list); 630 629 err = crypto_register_alg(&algs[i]); 631 630 if (err) 632 631 goto err_algs;
-2
drivers/crypto/tegra-aes.c
··· 1004 1004 1005 1005 aes_dev = dd; 1006 1006 for (i = 0; i < ARRAY_SIZE(algs); i++) { 1007 - INIT_LIST_HEAD(&algs[i].cra_list); 1008 - 1009 1007 algs[i].cra_priority = 300; 1010 1008 algs[i].cra_ctxsize = sizeof(struct tegra_aes_ctx); 1011 1009 algs[i].cra_module = THIS_MODULE;