irqchip: Switch back to struct platform_driver::remove()
authorUwe Kleine-König <u.kleine-koenig@baylibre.com>
Sat, 9 Nov 2024 17:38:27 +0000 (18:38 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 26 Nov 2024 19:09:06 +0000 (20:09 +0100)
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/irqchip/ 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: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20241109173828.291172-2-u.kleine-koenig@baylibre.com
12 files changed:
drivers/irqchip/irq-imgpdc.c
drivers/irqchip/irq-imx-intmux.c
drivers/irqchip/irq-imx-irqsteer.c
drivers/irqchip/irq-keystone.c
drivers/irqchip/irq-ls-scfg-msi.c
drivers/irqchip/irq-madera.c
drivers/irqchip/irq-mvebu-pic.c
drivers/irqchip/irq-pruss-intc.c
drivers/irqchip/irq-renesas-intc-irqpin.c
drivers/irqchip/irq-renesas-irqc.c
drivers/irqchip/irq-renesas-rza1.c
drivers/irqchip/irq-ts4800.c

index b42ed68..85f80ba 100644 (file)
@@ -479,7 +479,7 @@ static struct platform_driver pdc_intc_driver = {
                .of_match_table = pdc_intc_match,
        },
        .probe          = pdc_intc_probe,
-       .remove_new     = pdc_intc_remove,
+       .remove         = pdc_intc_remove,
 };
 
 static int __init pdc_intc_init(void)
index 511adfa..787543d 100644 (file)
@@ -361,6 +361,6 @@ static struct platform_driver imx_intmux_driver = {
                .pm             = &imx_intmux_pm_ops,
        },
        .probe          = imx_intmux_probe,
-       .remove_new     = imx_intmux_remove,
+       .remove         = imx_intmux_remove,
 };
 builtin_platform_driver(imx_intmux_driver);
index 75a0e98..b0e9788 100644 (file)
@@ -328,6 +328,6 @@ static struct platform_driver imx_irqsteer_driver = {
                .pm             = &imx_irqsteer_pm_ops,
        },
        .probe          = imx_irqsteer_probe,
-       .remove_new     = imx_irqsteer_remove,
+       .remove         = imx_irqsteer_remove,
 };
 builtin_platform_driver(imx_irqsteer_driver);
index 30f1979..808c781 100644 (file)
@@ -211,7 +211,7 @@ MODULE_DEVICE_TABLE(of, keystone_irq_dt_ids);
 
 static struct platform_driver keystone_irq_device_driver = {
        .probe          = keystone_irq_probe,
-       .remove_new     = keystone_irq_remove,
+       .remove         = keystone_irq_remove,
        .driver         = {
                .name   = "keystone_irq",
                .of_match_table = of_match_ptr(keystone_irq_dt_ids),
index 1aef5c4..c0e1aaf 100644 (file)
@@ -418,7 +418,7 @@ static struct platform_driver ls_scfg_msi_driver = {
                .of_match_table = ls_scfg_msi_id,
        },
        .probe          = ls_scfg_msi_probe,
-       .remove_new     = ls_scfg_msi_remove,
+       .remove         = ls_scfg_msi_remove,
 };
 
 module_platform_driver(ls_scfg_msi_driver);
index acceb6e..b32982c 100644 (file)
@@ -236,7 +236,7 @@ static void madera_irq_remove(struct platform_device *pdev)
 
 static struct platform_driver madera_irq_driver = {
        .probe          = madera_irq_probe,
-       .remove_new     = madera_irq_remove,
+       .remove         = madera_irq_remove,
        .driver = {
                .name   = "madera-irq",
                .pm     = &madera_irq_pm_ops,
index 08b0cc8..bd1e06e 100644 (file)
@@ -183,7 +183,7 @@ MODULE_DEVICE_TABLE(of, mvebu_pic_of_match);
 
 static struct platform_driver mvebu_pic_driver = {
        .probe          = mvebu_pic_probe,
-       .remove_new     = mvebu_pic_remove,
+       .remove         = mvebu_pic_remove,
        .driver = {
                .name           = "mvebu-pic",
                .of_match_table = mvebu_pic_of_match,
index 060eb00..bee0198 100644 (file)
@@ -648,7 +648,7 @@ static struct platform_driver pruss_intc_driver = {
                .suppress_bind_attrs    = true,
        },
        .probe          = pruss_intc_probe,
-       .remove_new     = pruss_intc_remove,
+       .remove         = pruss_intc_remove,
 };
 module_platform_driver(pruss_intc_driver);
 
index 9ad3723..954419f 100644 (file)
@@ -584,7 +584,7 @@ static SIMPLE_DEV_PM_OPS(intc_irqpin_pm_ops, intc_irqpin_suspend, NULL);
 
 static struct platform_driver intc_irqpin_device_driver = {
        .probe          = intc_irqpin_probe,
-       .remove_new     = intc_irqpin_remove,
+       .remove         = intc_irqpin_remove,
        .driver         = {
                .name           = "renesas_intc_irqpin",
                .of_match_table = intc_irqpin_dt_ids,
index 76026e0..cbce8ff 100644 (file)
@@ -247,7 +247,7 @@ MODULE_DEVICE_TABLE(of, irqc_dt_ids);
 
 static struct platform_driver irqc_device_driver = {
        .probe          = irqc_probe,
-       .remove_new     = irqc_remove,
+       .remove         = irqc_remove,
        .driver         = {
                .name           = "renesas_irqc",
                .of_match_table = irqc_dt_ids,
index f05afe8..d4e6a68 100644 (file)
@@ -259,7 +259,7 @@ MODULE_DEVICE_TABLE(of, rza1_irqc_dt_ids);
 
 static struct platform_driver rza1_irqc_device_driver = {
        .probe          = rza1_irqc_probe,
-       .remove_new     = rza1_irqc_remove,
+       .remove         = rza1_irqc_remove,
        .driver         = {
                .name           = "renesas_rza1_irqc",
                .of_match_table = rza1_irqc_dt_ids,
index b5dddb3..cc219f2 100644 (file)
@@ -154,7 +154,7 @@ MODULE_DEVICE_TABLE(of, ts4800_ic_of_match);
 
 static struct platform_driver ts4800_ic_driver = {
        .probe          = ts4800_ic_probe,
-       .remove_new     = ts4800_ic_remove,
+       .remove         = ts4800_ic_remove,
        .driver = {
                .name           = "ts4800-irqc",
                .of_match_table = ts4800_ic_of_match,