Skip to content

Commit 01d34cc

Browse files
ukleinekmpe
authored andcommitted
powerpc: 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 pwm drivers 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: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/20240909130902.851274-2-u.kleine-koenig@baylibre.com
1 parent b0e2b82 commit 01d34cc

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

arch/powerpc/platforms/512x/mpc512x_lpbfifo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ MODULE_DEVICE_TABLE(of, mpc512x_lpbfifo_match);
504504

505505
static struct platform_driver mpc512x_lpbfifo_driver = {
506506
.probe = mpc512x_lpbfifo_probe,
507-
.remove_new = mpc512x_lpbfifo_remove,
507+
.remove = mpc512x_lpbfifo_remove,
508508
.driver = {
509509
.name = DRV_NAME,
510510
.of_match_table = mpc512x_lpbfifo_match,

arch/powerpc/platforms/85xx/sgy_cts1000.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static struct platform_driver gpio_halt_driver = {
143143
.of_match_table = gpio_halt_match,
144144
},
145145
.probe = gpio_halt_probe,
146-
.remove_new = gpio_halt_remove,
146+
.remove = gpio_halt_remove,
147147
};
148148

149149
module_platform_driver(gpio_halt_driver);

arch/powerpc/platforms/pasemi/gpio_mdio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ MODULE_DEVICE_TABLE(of, gpio_mdio_match);
285285
static struct platform_driver gpio_mdio_driver =
286286
{
287287
.probe = gpio_mdio_probe,
288-
.remove_new = gpio_mdio_remove,
288+
.remove = gpio_mdio_remove,
289289
.driver = {
290290
.name = "gpio-mdio-bitbang",
291291
.of_match_table = gpio_mdio_match,

arch/powerpc/platforms/powernv/opal-prd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ static struct platform_driver opal_prd_driver = {
443443
.of_match_table = opal_prd_match,
444444
},
445445
.probe = opal_prd_probe,
446-
.remove_new = opal_prd_remove,
446+
.remove = opal_prd_remove,
447447
};
448448

449449
module_platform_driver(opal_prd_driver);

arch/powerpc/platforms/pseries/papr_scm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1509,7 +1509,7 @@ static const struct of_device_id papr_scm_match[] = {
15091509

15101510
static struct platform_driver papr_scm_driver = {
15111511
.probe = papr_scm_probe,
1512-
.remove_new = papr_scm_remove,
1512+
.remove = papr_scm_remove,
15131513
.driver = {
15141514
.name = "papr_scm",
15151515
.of_match_table = papr_scm_match,

arch/powerpc/sysdev/fsl_msi.c

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

609609
static __init int fsl_of_msi_init(void)

arch/powerpc/sysdev/pmi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ static void pmi_of_remove(struct platform_device *dev)
193193

194194
static struct platform_driver pmi_of_platform_driver = {
195195
.probe = pmi_of_probe,
196-
.remove_new = pmi_of_remove,
196+
.remove = pmi_of_remove,
197197
.driver = {
198198
.name = "pmi",
199199
.of_match_table = pmi_match,

0 commit comments

Comments
 (0)