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

Configure Feed

Select the types of activity you want to include in your feed.

crypto: drivers - Switch back to struct platform_driver::remove()

After commit 0edb555a65d1 ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.

Convert all platform drivers below drivers/crypto to use .remove(), with
the eventual goal to drop struct platform_driver::remove_new(). As
.remove() and .remove_new() have the same prototypes, conversion is done
by just changing the structure member name in the driver initializer.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Uwe Kleine-König and committed by
Herbert Xu
f51c527f 70199359

+46 -46
+1 -1
drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c
··· 542 542 543 543 static struct platform_driver sun4i_ss_driver = { 544 544 .probe = sun4i_ss_probe, 545 - .remove_new = sun4i_ss_remove, 545 + .remove = sun4i_ss_remove, 546 546 .driver = { 547 547 .name = "sun4i-ss", 548 548 .pm = &sun4i_ss_pm_ops,
+1 -1
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c
··· 1129 1129 1130 1130 static struct platform_driver sun8i_ce_driver = { 1131 1131 .probe = sun8i_ce_probe, 1132 - .remove_new = sun8i_ce_remove, 1132 + .remove = sun8i_ce_remove, 1133 1133 .driver = { 1134 1134 .name = "sun8i-ce", 1135 1135 .pm = &sun8i_ce_pm_ops,
+1 -1
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c
··· 929 929 930 930 static struct platform_driver sun8i_ss_driver = { 931 931 .probe = sun8i_ss_probe, 932 - .remove_new = sun8i_ss_remove, 932 + .remove = sun8i_ss_remove, 933 933 .driver = { 934 934 .name = "sun8i-ss", 935 935 .pm = &sun8i_ss_pm_ops,
+1 -1
drivers/crypto/amcc/crypto4xx_core.c
··· 1497 1497 .of_match_table = crypto4xx_match, 1498 1498 }, 1499 1499 .probe = crypto4xx_probe, 1500 - .remove_new = crypto4xx_remove, 1500 + .remove = crypto4xx_remove, 1501 1501 }; 1502 1502 1503 1503 module_platform_driver(crypto4xx_driver);
+1 -1
drivers/crypto/amlogic/amlogic-gxl-core.c
··· 320 320 321 321 static struct platform_driver meson_crypto_driver = { 322 322 .probe = meson_crypto_probe, 323 - .remove_new = meson_crypto_remove, 323 + .remove = meson_crypto_remove, 324 324 .driver = { 325 325 .name = "gxl-crypto", 326 326 .of_match_table = meson_crypto_of_match_table,
+1 -1
drivers/crypto/aspeed/aspeed-acry.c
··· 806 806 807 807 static struct platform_driver aspeed_acry_driver = { 808 808 .probe = aspeed_acry_probe, 809 - .remove_new = aspeed_acry_remove, 809 + .remove = aspeed_acry_remove, 810 810 .driver = { 811 811 .name = KBUILD_MODNAME, 812 812 .of_match_table = aspeed_acry_of_matches,
+1 -1
drivers/crypto/aspeed/aspeed-hace.c
··· 266 266 267 267 static struct platform_driver aspeed_hace_driver = { 268 268 .probe = aspeed_hace_probe, 269 - .remove_new = aspeed_hace_remove, 269 + .remove = aspeed_hace_remove, 270 270 .driver = { 271 271 .name = KBUILD_MODNAME, 272 272 .of_match_table = aspeed_hace_of_matches,
+1 -1
drivers/crypto/atmel-aes.c
··· 2453 2453 2454 2454 static struct platform_driver atmel_aes_driver = { 2455 2455 .probe = atmel_aes_probe, 2456 - .remove_new = atmel_aes_remove, 2456 + .remove = atmel_aes_remove, 2457 2457 .driver = { 2458 2458 .name = "atmel_aes", 2459 2459 .of_match_table = atmel_aes_dt_ids,
+1 -1
drivers/crypto/atmel-sha.c
··· 2691 2691 2692 2692 static struct platform_driver atmel_sha_driver = { 2693 2693 .probe = atmel_sha_probe, 2694 - .remove_new = atmel_sha_remove, 2694 + .remove = atmel_sha_remove, 2695 2695 .driver = { 2696 2696 .name = "atmel_sha", 2697 2697 .of_match_table = atmel_sha_dt_ids,
+1 -1
drivers/crypto/atmel-tdes.c
··· 1074 1074 1075 1075 static struct platform_driver atmel_tdes_driver = { 1076 1076 .probe = atmel_tdes_probe, 1077 - .remove_new = atmel_tdes_remove, 1077 + .remove = atmel_tdes_remove, 1078 1078 .driver = { 1079 1079 .name = "atmel_tdes", 1080 1080 .of_match_table = atmel_tdes_dt_ids,
+1 -1
drivers/crypto/axis/artpec6_crypto.c
··· 2975 2975 2976 2976 static struct platform_driver artpec6_crypto_driver = { 2977 2977 .probe = artpec6_crypto_probe, 2978 - .remove_new = artpec6_crypto_remove, 2978 + .remove = artpec6_crypto_remove, 2979 2979 .driver = { 2980 2980 .name = "artpec6-crypto", 2981 2981 .of_match_table = artpec6_crypto_of_match,
+1 -1
drivers/crypto/bcm/cipher.c
··· 4704 4704 .of_match_table = of_match_ptr(bcm_spu_dt_ids), 4705 4705 }, 4706 4706 .probe = bcm_spu_probe, 4707 - .remove_new = bcm_spu_remove, 4707 + .remove = bcm_spu_remove, 4708 4708 }; 4709 4709 module_platform_driver(bcm_spu_pdriver); 4710 4710
+1 -1
drivers/crypto/caam/jr.c
··· 819 819 .pm = pm_ptr(&caam_jr_pm_ops), 820 820 }, 821 821 .probe = caam_jr_probe, 822 - .remove_new = caam_jr_remove, 822 + .remove = caam_jr_remove, 823 823 .shutdown = caam_jr_remove, 824 824 }; 825 825
+1 -1
drivers/crypto/ccp/sp-platform.c
··· 210 210 .of_match_table = sp_of_match, 211 211 }, 212 212 .probe = sp_platform_probe, 213 - .remove_new = sp_platform_remove, 213 + .remove = sp_platform_remove, 214 214 #ifdef CONFIG_PM 215 215 .suspend = sp_platform_suspend, 216 216 .resume = sp_platform_resume,
+1 -1
drivers/crypto/ccree/cc_driver.c
··· 643 643 #endif 644 644 }, 645 645 .probe = ccree_probe, 646 - .remove_new = ccree_remove, 646 + .remove = ccree_remove, 647 647 }; 648 648 649 649 static int __init ccree_init(void)
+1 -1
drivers/crypto/exynos-rng.c
··· 389 389 .of_match_table = exynos_rng_dt_match, 390 390 }, 391 391 .probe = exynos_rng_probe, 392 - .remove_new = exynos_rng_remove, 392 + .remove = exynos_rng_remove, 393 393 }; 394 394 395 395 module_platform_driver(exynos_rng_driver);
+1 -1
drivers/crypto/gemini/sl3516-ce-core.c
··· 528 528 529 529 static struct platform_driver sl3516_ce_driver = { 530 530 .probe = sl3516_ce_probe, 531 - .remove_new = sl3516_ce_remove, 531 + .remove = sl3516_ce_remove, 532 532 .driver = { 533 533 .name = "sl3516-crypto", 534 534 .pm = &sl3516_ce_pm_ops,
+1 -1
drivers/crypto/hisilicon/sec/sec_drv.c
··· 1304 1304 1305 1305 static struct platform_driver sec_driver = { 1306 1306 .probe = sec_probe, 1307 - .remove_new = sec_remove, 1307 + .remove = sec_remove, 1308 1308 .driver = { 1309 1309 .name = "hisi_sec_platform_driver", 1310 1310 .of_match_table = sec_match,
+1 -1
drivers/crypto/hisilicon/trng/trng.c
··· 324 324 325 325 static struct platform_driver hisi_trng_driver = { 326 326 .probe = hisi_trng_probe, 327 - .remove_new = hisi_trng_remove, 327 + .remove = hisi_trng_remove, 328 328 .driver = { 329 329 .name = "hisi-trng-v2", 330 330 .acpi_match_table = ACPI_PTR(hisi_trng_acpi_match),
+1 -1
drivers/crypto/img-hash.c
··· 1084 1084 1085 1085 static struct platform_driver img_hash_driver = { 1086 1086 .probe = img_hash_probe, 1087 - .remove_new = img_hash_remove, 1087 + .remove = img_hash_remove, 1088 1088 .driver = { 1089 1089 .name = "img-hash-accelerator", 1090 1090 .pm = &img_hash_pm_ops,
+1 -1
drivers/crypto/inside-secure/safexcel.c
··· 1868 1868 1869 1869 static struct platform_driver crypto_safexcel = { 1870 1870 .probe = safexcel_probe, 1871 - .remove_new = safexcel_remove, 1871 + .remove = safexcel_remove, 1872 1872 .driver = { 1873 1873 .name = "crypto-safexcel", 1874 1874 .of_match_table = safexcel_of_match_table,
+1 -1
drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
··· 1588 1588 1589 1589 static struct platform_driver ixp_crypto_driver = { 1590 1590 .probe = ixp_crypto_probe, 1591 - .remove_new = ixp_crypto_remove, 1591 + .remove = ixp_crypto_remove, 1592 1592 .driver = { 1593 1593 .name = "ixp4xx_crypto", 1594 1594 .of_match_table = ixp4xx_crypto_of_match,
+1 -1
drivers/crypto/intel/keembay/keembay-ocs-aes-core.c
··· 1656 1656 /* The OCS driver is a platform device. */ 1657 1657 static struct platform_driver kmb_ocs_aes_driver = { 1658 1658 .probe = kmb_ocs_aes_probe, 1659 - .remove_new = kmb_ocs_aes_remove, 1659 + .remove = kmb_ocs_aes_remove, 1660 1660 .driver = { 1661 1661 .name = DRV_NAME, 1662 1662 .of_match_table = kmb_ocs_aes_of_match,
+1 -1
drivers/crypto/intel/keembay/keembay-ocs-ecc.c
··· 991 991 /* The OCS driver is a platform device. */ 992 992 static struct platform_driver kmb_ocs_ecc_driver = { 993 993 .probe = kmb_ocs_ecc_probe, 994 - .remove_new = kmb_ocs_ecc_remove, 994 + .remove = kmb_ocs_ecc_remove, 995 995 .driver = { 996 996 .name = DRV_NAME, 997 997 .of_match_table = kmb_ocs_ecc_of_match,
+1 -1
drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c
··· 1243 1243 /* The OCS driver is a platform device. */ 1244 1244 static struct platform_driver kmb_ocs_hcu_driver = { 1245 1245 .probe = kmb_ocs_hcu_probe, 1246 - .remove_new = kmb_ocs_hcu_remove, 1246 + .remove = kmb_ocs_hcu_remove, 1247 1247 .driver = { 1248 1248 .name = DRV_NAME, 1249 1249 .of_match_table = kmb_ocs_hcu_of_match,
+1 -1
drivers/crypto/marvell/cesa/cesa.c
··· 604 604 605 605 static struct platform_driver marvell_cesa = { 606 606 .probe = mv_cesa_probe, 607 - .remove_new = mv_cesa_remove, 607 + .remove = mv_cesa_remove, 608 608 .id_table = mv_cesa_plat_id_table, 609 609 .driver = { 610 610 .name = "marvell-cesa",
+1 -1
drivers/crypto/mxs-dcp.c
··· 1247 1247 1248 1248 static struct platform_driver mxs_dcp_driver = { 1249 1249 .probe = mxs_dcp_probe, 1250 - .remove_new = mxs_dcp_remove, 1250 + .remove = mxs_dcp_remove, 1251 1251 .driver = { 1252 1252 .name = "mxs-dcp", 1253 1253 .of_match_table = mxs_dcp_dt_ids,
+2 -2
drivers/crypto/n2_core.c
··· 2119 2119 .of_match_table = n2_crypto_match, 2120 2120 }, 2121 2121 .probe = n2_crypto_probe, 2122 - .remove_new = n2_crypto_remove, 2122 + .remove = n2_crypto_remove, 2123 2123 }; 2124 2124 2125 2125 static const struct of_device_id n2_mau_match[] = { ··· 2146 2146 .of_match_table = n2_mau_match, 2147 2147 }, 2148 2148 .probe = n2_mau_probe, 2149 - .remove_new = n2_mau_remove, 2149 + .remove = n2_mau_remove, 2150 2150 }; 2151 2151 2152 2152 static struct platform_driver * const drivers[] = {
+1 -1
drivers/crypto/omap-aes.c
··· 1305 1305 1306 1306 static struct platform_driver omap_aes_driver = { 1307 1307 .probe = omap_aes_probe, 1308 - .remove_new = omap_aes_remove, 1308 + .remove = omap_aes_remove, 1309 1309 .driver = { 1310 1310 .name = "omap-aes", 1311 1311 .pm = &omap_aes_pm_ops,
+1 -1
drivers/crypto/omap-des.c
··· 1115 1115 1116 1116 static struct platform_driver omap_des_driver = { 1117 1117 .probe = omap_des_probe, 1118 - .remove_new = omap_des_remove, 1118 + .remove = omap_des_remove, 1119 1119 .driver = { 1120 1120 .name = "omap-des", 1121 1121 .pm = &omap_des_pm_ops,
+1 -1
drivers/crypto/omap-sham.c
··· 2216 2216 2217 2217 static struct platform_driver omap_sham_driver = { 2218 2218 .probe = omap_sham_probe, 2219 - .remove_new = omap_sham_remove, 2219 + .remove = omap_sham_remove, 2220 2220 .driver = { 2221 2221 .name = "omap-sham", 2222 2222 .of_match_table = omap_sham_of_match,
+1 -1
drivers/crypto/qce/core.c
··· 299 299 300 300 static struct platform_driver qce_crypto_driver = { 301 301 .probe = qce_crypto_probe, 302 - .remove_new = qce_crypto_remove, 302 + .remove = qce_crypto_remove, 303 303 .driver = { 304 304 .name = KBUILD_MODNAME, 305 305 .of_match_table = qce_crypto_of_match,
+1 -1
drivers/crypto/qcom-rng.c
··· 262 262 263 263 static struct platform_driver qcom_rng_driver = { 264 264 .probe = qcom_rng_probe, 265 - .remove_new = qcom_rng_remove, 265 + .remove = qcom_rng_remove, 266 266 .driver = { 267 267 .name = KBUILD_MODNAME, 268 268 .of_match_table = of_match_ptr(qcom_rng_of_match),
+1 -1
drivers/crypto/rockchip/rk3288_crypto.c
··· 433 433 434 434 static struct platform_driver crypto_driver = { 435 435 .probe = rk_crypto_probe, 436 - .remove_new = rk_crypto_remove, 436 + .remove = rk_crypto_remove, 437 437 .driver = { 438 438 .name = "rk3288-crypto", 439 439 .pm = &rk_crypto_pm_ops,
+1 -1
drivers/crypto/s5p-sss.c
··· 2335 2335 2336 2336 static struct platform_driver s5p_aes_crypto = { 2337 2337 .probe = s5p_aes_probe, 2338 - .remove_new = s5p_aes_remove, 2338 + .remove = s5p_aes_remove, 2339 2339 .driver = { 2340 2340 .name = "s5p-secss", 2341 2341 .of_match_table = s5p_sss_dt_match,
+1 -1
drivers/crypto/sa2ul.c
··· 2489 2489 2490 2490 static struct platform_driver sa_ul_driver = { 2491 2491 .probe = sa_ul_probe, 2492 - .remove_new = sa_ul_remove, 2492 + .remove = sa_ul_remove, 2493 2493 .driver = { 2494 2494 .name = "saul-crypto", 2495 2495 .of_match_table = of_match,
+1 -1
drivers/crypto/sahara.c
··· 1421 1421 1422 1422 static struct platform_driver sahara_driver = { 1423 1423 .probe = sahara_probe, 1424 - .remove_new = sahara_remove, 1424 + .remove = sahara_remove, 1425 1425 .driver = { 1426 1426 .name = SAHARA_NAME, 1427 1427 .of_match_table = sahara_dt_ids,
+1 -1
drivers/crypto/starfive/jh7110-cryp.c
··· 215 215 216 216 static struct platform_driver starfive_cryp_driver = { 217 217 .probe = starfive_cryp_probe, 218 - .remove_new = starfive_cryp_remove, 218 + .remove = starfive_cryp_remove, 219 219 .driver = { 220 220 .name = DRIVER_NAME, 221 221 .of_match_table = starfive_dt_ids,
+1 -1
drivers/crypto/stm32/stm32-crc32.c
··· 465 465 466 466 static struct platform_driver stm32_crc_driver = { 467 467 .probe = stm32_crc_probe, 468 - .remove_new = stm32_crc_remove, 468 + .remove = stm32_crc_remove, 469 469 .driver = { 470 470 .name = DRIVER_NAME, 471 471 .pm = &stm32_crc_pm_ops,
+1 -1
drivers/crypto/stm32/stm32-cryp.c
··· 2771 2771 2772 2772 static struct platform_driver stm32_cryp_driver = { 2773 2773 .probe = stm32_cryp_probe, 2774 - .remove_new = stm32_cryp_remove, 2774 + .remove = stm32_cryp_remove, 2775 2775 .driver = { 2776 2776 .name = DRIVER_NAME, 2777 2777 .pm = &stm32_cryp_pm_ops,
+1 -1
drivers/crypto/stm32/stm32-hash.c
··· 2532 2532 2533 2533 static struct platform_driver stm32_hash_driver = { 2534 2534 .probe = stm32_hash_probe, 2535 - .remove_new = stm32_hash_remove, 2535 + .remove = stm32_hash_remove, 2536 2536 .driver = { 2537 2537 .name = "stm32-hash", 2538 2538 .pm = &stm32_hash_pm_ops,
+1 -1
drivers/crypto/talitos.c
··· 3560 3560 .of_match_table = talitos_match, 3561 3561 }, 3562 3562 .probe = talitos_probe, 3563 - .remove_new = talitos_remove, 3563 + .remove = talitos_remove, 3564 3564 }; 3565 3565 3566 3566 module_platform_driver(talitos_driver);
+1 -1
drivers/crypto/tegra/tegra-se-main.c
··· 387 387 .of_match_table = tegra_se_of_match, 388 388 }, 389 389 .probe = tegra_se_probe, 390 - .remove_new = tegra_se_remove, 390 + .remove = tegra_se_remove, 391 391 }; 392 392 393 393 static int tegra_se_host1x_probe(struct host1x_device *dev)
+1 -1
drivers/crypto/xilinx/zynqmp-aes-gcm.c
··· 438 438 439 439 static struct platform_driver zynqmp_aes_driver = { 440 440 .probe = zynqmp_aes_aead_probe, 441 - .remove_new = zynqmp_aes_aead_remove, 441 + .remove = zynqmp_aes_aead_remove, 442 442 .driver = { 443 443 .name = "zynqmp-aes", 444 444 .of_match_table = zynqmp_aes_dt_ids,
+1 -1
drivers/crypto/xilinx/zynqmp-sha.c
··· 248 248 249 249 static struct platform_driver zynqmp_sha_driver = { 250 250 .probe = zynqmp_sha_probe, 251 - .remove_new = zynqmp_sha_remove, 251 + .remove = zynqmp_sha_remove, 252 252 .driver = { 253 253 .name = "zynqmp-sha3-384", 254 254 },