irqchip: 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/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

diff --git a/drivers/irqchip/irq-imgpdc.c b/drivers/irqchip/irq-imgpdc.c
index b42ed68acfa66767e73b063705e031dfd6883fdb..85f80bac096159c8de66db9776dab79b740c8745 100644 (file)
--- a/drivers/irqchip/irq-imgpdc.c
+++ b/drivers/irqchip/irq-imgpdc.c
@@ -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)

diff --git a/drivers/irqchip/irq-imx-intmux.c b/drivers/irqchip/irq-imx-intmux.c
index 511adfaeec8227f018a07c1d8fb472c86323bf3c..787543d07565be3a97c22aeedbe0557ce470ad6c 100644 (file)
--- a/drivers/irqchip/irq-imx-intmux.c
+++ b/drivers/irqchip/irq-imx-intmux.c
@@ -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);

diff --git a/drivers/irqchip/irq-imx-irqsteer.c b/drivers/irqchip/irq-imx-irqsteer.c
index 75a0e980ff352493e6b638b3073149374f7b5c34..b0e9788c0045488842b4239f73bc24e786eb1982 100644 (file)
--- a/drivers/irqchip/irq-imx-irqsteer.c
+++ b/drivers/irqchip/irq-imx-irqsteer.c
@@ -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);

diff --git a/drivers/irqchip/irq-keystone.c b/drivers/irqchip/irq-keystone.c
index 30f1979fa1240a3d8d7642fb60e34025d10bf138..808c781e254835161813eb09a4ac3498ee6f334c 100644 (file)
--- a/drivers/irqchip/irq-keystone.c
+++ b/drivers/irqchip/irq-keystone.c
@@ -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),

diff --git a/drivers/irqchip/irq-ls-scfg-msi.c b/drivers/irqchip/irq-ls-scfg-msi.c
index 1aef5c4d27c63130648093e24bdb8f89cda75aef..c0e1aafe468c321f30b680f6556e1597f49077fc 100644 (file)
--- a/drivers/irqchip/irq-ls-scfg-msi.c
+++ b/drivers/irqchip/irq-ls-scfg-msi.c
@@ -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);

diff --git a/drivers/irqchip/irq-madera.c b/drivers/irqchip/irq-madera.c
index acceb6e7fa95f5af6e1c76065a43701e225f7922..b32982c11515ff4b02c489e56fe6addaf357a01b 100644 (file)
--- a/drivers/irqchip/irq-madera.c
+++ b/drivers/irqchip/irq-madera.c
@@ -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,

diff --git a/drivers/irqchip/irq-mvebu-pic.c b/drivers/irqchip/irq-mvebu-pic.c
index 08b0cc862adf03eccab646ac62bf26d4e3ec941b..bd1e06e05a396b0c412efdfaf60444da112f66eb 100644 (file)
--- a/drivers/irqchip/irq-mvebu-pic.c
+++ b/drivers/irqchip/irq-mvebu-pic.c
@@ -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,

diff --git a/drivers/irqchip/irq-pruss-intc.c b/drivers/irqchip/irq-pruss-intc.c
index 060eb000e9d359ec54d59f4a31ad6b7be44dd8c3..bee01980b4630c2c4ac03be4c65f91fe084fd4af 100644 (file)
--- a/drivers/irqchip/irq-pruss-intc.c
+++ b/drivers/irqchip/irq-pruss-intc.c
@@ -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);
 

diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
index 9ad37237ba9547d235a41bfd5ed2201a2b34c5e8..954419f2460d1180b2484a337539d9c53e4aeaba 100644 (file)
--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
@@ -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,

diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
index 76026e0b8e2010649889b0285463d0219dbf8b01..cbce8ffc7de4aae0721bc9cea18766d072a8ddb4 100644 (file)
--- a/drivers/irqchip/irq-renesas-irqc.c
+++ b/drivers/irqchip/irq-renesas-irqc.c
@@ -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,

diff --git a/drivers/irqchip/irq-renesas-rza1.c b/drivers/irqchip/irq-renesas-rza1.c
index f05afe82db4d1ddd1a4ec0f2de251fd5878b0651..d4e6a68889ec1c02d3d6729f499064b4fba51d29 100644 (file)
--- a/drivers/irqchip/irq-renesas-rza1.c
+++ b/drivers/irqchip/irq-renesas-rza1.c
@@ -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,

diff --git a/drivers/irqchip/irq-ts4800.c b/drivers/irqchip/irq-ts4800.c
index b5dddb3c1568ea6c9f2da61ed4069c00c7f27249..cc219f28d317fed141d882fea637d6490c0ecc23 100644 (file)
--- a/drivers/irqchip/irq-ts4800.c
+++ b/drivers/irqchip/irq-ts4800.c
@@ -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,