Skip to content

Commit d11c8b8

Browse files
ukleinekherbertx
authored andcommitted
hwrng: drivers - Switch back to struct platform_driver::remove()
After commit 0edb555 ("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 <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
1 parent d186faa commit d11c8b8

File tree

12 files changed

+12
-12
lines changed

12 files changed

+12
-12
lines changed

drivers/char/hw_random/atmel-rng.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ MODULE_DEVICE_TABLE(of, atmel_trng_dt_ids);
216216

217217
static struct platform_driver atmel_trng_driver = {
218218
.probe = atmel_trng_probe,
219-
.remove_new = atmel_trng_remove,
219+
.remove = atmel_trng_remove,
220220
.driver = {
221221
.name = "atmel-trng",
222222
.pm = pm_ptr(&atmel_trng_pm_ops),

drivers/char/hw_random/cctrng.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ static struct platform_driver cctrng_driver = {
653653
.pm = &cctrng_pm,
654654
},
655655
.probe = cctrng_probe,
656-
.remove_new = cctrng_remove,
656+
.remove = cctrng_remove,
657657
};
658658

659659
module_platform_driver(cctrng_driver);

drivers/char/hw_random/exynos-trng.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ static struct platform_driver exynos_trng_driver = {
335335
.of_match_table = exynos_trng_dt_match,
336336
},
337337
.probe = exynos_trng_probe,
338-
.remove_new = exynos_trng_remove,
338+
.remove = exynos_trng_remove,
339339
};
340340

341341
module_platform_driver(exynos_trng_driver);

drivers/char/hw_random/ingenic-rng.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ MODULE_DEVICE_TABLE(of, ingenic_rng_of_match);
132132

133133
static struct platform_driver ingenic_rng_driver = {
134134
.probe = ingenic_rng_probe,
135-
.remove_new = ingenic_rng_remove,
135+
.remove = ingenic_rng_remove,
136136
.driver = {
137137
.name = "ingenic-rng",
138138
.of_match_table = ingenic_rng_of_match,

drivers/char/hw_random/ks-sa-rng.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ static struct platform_driver ks_sa_rng_driver = {
261261
.of_match_table = ks_sa_rng_dt_match,
262262
},
263263
.probe = ks_sa_rng_probe,
264-
.remove_new = ks_sa_rng_remove,
264+
.remove = ks_sa_rng_remove,
265265
};
266266

267267
module_platform_driver(ks_sa_rng_driver);

drivers/char/hw_random/mxc-rnga.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ static struct platform_driver mxc_rnga_driver = {
188188
.of_match_table = mxc_rnga_of_match,
189189
},
190190
.probe = mxc_rnga_probe,
191-
.remove_new = mxc_rnga_remove,
191+
.remove = mxc_rnga_remove,
192192
};
193193

194194
module_platform_driver(mxc_rnga_driver);

drivers/char/hw_random/n2-drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ static struct platform_driver n2rng_driver = {
858858
.of_match_table = n2rng_match,
859859
},
860860
.probe = n2rng_probe,
861-
.remove_new = n2rng_remove,
861+
.remove = n2rng_remove,
862862
};
863863

864864
module_platform_driver(n2rng_driver);

drivers/char/hw_random/npcm-rng.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ static struct platform_driver npcm_rng_driver = {
176176
.of_match_table = of_match_ptr(rng_dt_id),
177177
},
178178
.probe = npcm_rng_probe,
179-
.remove_new = npcm_rng_remove,
179+
.remove = npcm_rng_remove,
180180
};
181181

182182
module_platform_driver(npcm_rng_driver);

drivers/char/hw_random/omap-rng.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ static struct platform_driver omap_rng_driver = {
558558
.of_match_table = of_match_ptr(omap_rng_of_match),
559559
},
560560
.probe = omap_rng_probe,
561-
.remove_new = omap_rng_remove,
561+
.remove = omap_rng_remove,
562562
};
563563

564564
module_platform_driver(omap_rng_driver);

drivers/char/hw_random/stm32-rng.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ static struct platform_driver stm32_rng_driver = {
603603
.of_match_table = stm32_rng_match,
604604
},
605605
.probe = stm32_rng_probe,
606-
.remove_new = stm32_rng_remove,
606+
.remove = stm32_rng_remove,
607607
};
608608

609609
module_platform_driver(stm32_rng_driver);

0 commit comments

Comments
 (0)