Skip to content

Commit

Permalink
irqchip: Switch back to struct platform_driver::remove()
Browse files Browse the repository at this point in the history
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/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
  • Loading branch information
Uwe Kleine-König authored and Thomas Gleixner committed Nov 26, 2024
1 parent f82e62d commit cc47268
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion drivers/irqchip/irq-imgpdc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/irqchip/irq-imx-intmux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion drivers/irqchip/irq-imx-irqsteer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion drivers/irqchip/irq-keystone.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion drivers/irqchip/irq-ls-scfg-msi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/irqchip/irq-madera.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/irqchip/irq-mvebu-pic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/irqchip/irq-pruss-intc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/irqchip/irq-renesas-intc-irqpin.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/irqchip/irq-renesas-irqc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/irqchip/irq-renesas-rza1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/irqchip/irq-ts4800.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit cc47268

Please sign in to comment.