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

hwrng: 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/char/hw_random 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
d11c8b87 d186faa3

+12 -12
+1 -1
drivers/char/hw_random/atmel-rng.c
··· 216 216 217 217 static struct platform_driver atmel_trng_driver = { 218 218 .probe = atmel_trng_probe, 219 - .remove_new = atmel_trng_remove, 219 + .remove = atmel_trng_remove, 220 220 .driver = { 221 221 .name = "atmel-trng", 222 222 .pm = pm_ptr(&atmel_trng_pm_ops),
+1 -1
drivers/char/hw_random/cctrng.c
··· 653 653 .pm = &cctrng_pm, 654 654 }, 655 655 .probe = cctrng_probe, 656 - .remove_new = cctrng_remove, 656 + .remove = cctrng_remove, 657 657 }; 658 658 659 659 module_platform_driver(cctrng_driver);
+1 -1
drivers/char/hw_random/exynos-trng.c
··· 335 335 .of_match_table = exynos_trng_dt_match, 336 336 }, 337 337 .probe = exynos_trng_probe, 338 - .remove_new = exynos_trng_remove, 338 + .remove = exynos_trng_remove, 339 339 }; 340 340 341 341 module_platform_driver(exynos_trng_driver);
+1 -1
drivers/char/hw_random/ingenic-rng.c
··· 132 132 133 133 static struct platform_driver ingenic_rng_driver = { 134 134 .probe = ingenic_rng_probe, 135 - .remove_new = ingenic_rng_remove, 135 + .remove = ingenic_rng_remove, 136 136 .driver = { 137 137 .name = "ingenic-rng", 138 138 .of_match_table = ingenic_rng_of_match,
+1 -1
drivers/char/hw_random/ks-sa-rng.c
··· 261 261 .of_match_table = ks_sa_rng_dt_match, 262 262 }, 263 263 .probe = ks_sa_rng_probe, 264 - .remove_new = ks_sa_rng_remove, 264 + .remove = ks_sa_rng_remove, 265 265 }; 266 266 267 267 module_platform_driver(ks_sa_rng_driver);
+1 -1
drivers/char/hw_random/mxc-rnga.c
··· 188 188 .of_match_table = mxc_rnga_of_match, 189 189 }, 190 190 .probe = mxc_rnga_probe, 191 - .remove_new = mxc_rnga_remove, 191 + .remove = mxc_rnga_remove, 192 192 }; 193 193 194 194 module_platform_driver(mxc_rnga_driver);
+1 -1
drivers/char/hw_random/n2-drv.c
··· 858 858 .of_match_table = n2rng_match, 859 859 }, 860 860 .probe = n2rng_probe, 861 - .remove_new = n2rng_remove, 861 + .remove = n2rng_remove, 862 862 }; 863 863 864 864 module_platform_driver(n2rng_driver);
+1 -1
drivers/char/hw_random/npcm-rng.c
··· 176 176 .of_match_table = of_match_ptr(rng_dt_id), 177 177 }, 178 178 .probe = npcm_rng_probe, 179 - .remove_new = npcm_rng_remove, 179 + .remove = npcm_rng_remove, 180 180 }; 181 181 182 182 module_platform_driver(npcm_rng_driver);
+1 -1
drivers/char/hw_random/omap-rng.c
··· 558 558 .of_match_table = of_match_ptr(omap_rng_of_match), 559 559 }, 560 560 .probe = omap_rng_probe, 561 - .remove_new = omap_rng_remove, 561 + .remove = omap_rng_remove, 562 562 }; 563 563 564 564 module_platform_driver(omap_rng_driver);
+1 -1
drivers/char/hw_random/stm32-rng.c
··· 603 603 .of_match_table = stm32_rng_match, 604 604 }, 605 605 .probe = stm32_rng_probe, 606 - .remove_new = stm32_rng_remove, 606 + .remove = stm32_rng_remove, 607 607 }; 608 608 609 609 module_platform_driver(stm32_rng_driver);
+1 -1
drivers/char/hw_random/timeriomem-rng.c
··· 193 193 .of_match_table = timeriomem_rng_match, 194 194 }, 195 195 .probe = timeriomem_rng_probe, 196 - .remove_new = timeriomem_rng_remove, 196 + .remove = timeriomem_rng_remove, 197 197 }; 198 198 199 199 module_platform_driver(timeriomem_rng_driver);
+1 -1
drivers/char/hw_random/xgene-rng.c
··· 375 375 376 376 static struct platform_driver xgene_rng_driver = { 377 377 .probe = xgene_rng_probe, 378 - .remove_new = xgene_rng_remove, 378 + .remove = xgene_rng_remove, 379 379 .driver = { 380 380 .name = "xgene-rng", 381 381 .of_match_table = xgene_rng_of_match,