Skip to content

Commit cc47268

Browse files
ukleinekKAGA-KOKO
authored andcommitted
irqchip: 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/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 <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/all/[email protected]
1 parent f82e62d commit cc47268

12 files changed

+12
-12
lines changed

drivers/irqchip/irq-imgpdc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ static struct platform_driver pdc_intc_driver = {
479479
.of_match_table = pdc_intc_match,
480480
},
481481
.probe = pdc_intc_probe,
482-
.remove_new = pdc_intc_remove,
482+
.remove = pdc_intc_remove,
483483
};
484484

485485
static int __init pdc_intc_init(void)

drivers/irqchip/irq-imx-intmux.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,6 @@ static struct platform_driver imx_intmux_driver = {
361361
.pm = &imx_intmux_pm_ops,
362362
},
363363
.probe = imx_intmux_probe,
364-
.remove_new = imx_intmux_remove,
364+
.remove = imx_intmux_remove,
365365
};
366366
builtin_platform_driver(imx_intmux_driver);

drivers/irqchip/irq-imx-irqsteer.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,6 @@ static struct platform_driver imx_irqsteer_driver = {
328328
.pm = &imx_irqsteer_pm_ops,
329329
},
330330
.probe = imx_irqsteer_probe,
331-
.remove_new = imx_irqsteer_remove,
331+
.remove = imx_irqsteer_remove,
332332
};
333333
builtin_platform_driver(imx_irqsteer_driver);

drivers/irqchip/irq-keystone.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ MODULE_DEVICE_TABLE(of, keystone_irq_dt_ids);
211211

212212
static struct platform_driver keystone_irq_device_driver = {
213213
.probe = keystone_irq_probe,
214-
.remove_new = keystone_irq_remove,
214+
.remove = keystone_irq_remove,
215215
.driver = {
216216
.name = "keystone_irq",
217217
.of_match_table = of_match_ptr(keystone_irq_dt_ids),

drivers/irqchip/irq-ls-scfg-msi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ static struct platform_driver ls_scfg_msi_driver = {
418418
.of_match_table = ls_scfg_msi_id,
419419
},
420420
.probe = ls_scfg_msi_probe,
421-
.remove_new = ls_scfg_msi_remove,
421+
.remove = ls_scfg_msi_remove,
422422
};
423423

424424
module_platform_driver(ls_scfg_msi_driver);

drivers/irqchip/irq-madera.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ static void madera_irq_remove(struct platform_device *pdev)
236236

237237
static struct platform_driver madera_irq_driver = {
238238
.probe = madera_irq_probe,
239-
.remove_new = madera_irq_remove,
239+
.remove = madera_irq_remove,
240240
.driver = {
241241
.name = "madera-irq",
242242
.pm = &madera_irq_pm_ops,

drivers/irqchip/irq-mvebu-pic.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ MODULE_DEVICE_TABLE(of, mvebu_pic_of_match);
183183

184184
static struct platform_driver mvebu_pic_driver = {
185185
.probe = mvebu_pic_probe,
186-
.remove_new = mvebu_pic_remove,
186+
.remove = mvebu_pic_remove,
187187
.driver = {
188188
.name = "mvebu-pic",
189189
.of_match_table = mvebu_pic_of_match,

drivers/irqchip/irq-pruss-intc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ static struct platform_driver pruss_intc_driver = {
648648
.suppress_bind_attrs = true,
649649
},
650650
.probe = pruss_intc_probe,
651-
.remove_new = pruss_intc_remove,
651+
.remove = pruss_intc_remove,
652652
};
653653
module_platform_driver(pruss_intc_driver);
654654

drivers/irqchip/irq-renesas-intc-irqpin.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ static SIMPLE_DEV_PM_OPS(intc_irqpin_pm_ops, intc_irqpin_suspend, NULL);
584584

585585
static struct platform_driver intc_irqpin_device_driver = {
586586
.probe = intc_irqpin_probe,
587-
.remove_new = intc_irqpin_remove,
587+
.remove = intc_irqpin_remove,
588588
.driver = {
589589
.name = "renesas_intc_irqpin",
590590
.of_match_table = intc_irqpin_dt_ids,

drivers/irqchip/irq-renesas-irqc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ MODULE_DEVICE_TABLE(of, irqc_dt_ids);
247247

248248
static struct platform_driver irqc_device_driver = {
249249
.probe = irqc_probe,
250-
.remove_new = irqc_remove,
250+
.remove = irqc_remove,
251251
.driver = {
252252
.name = "renesas_irqc",
253253
.of_match_table = irqc_dt_ids,

drivers/irqchip/irq-renesas-rza1.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ MODULE_DEVICE_TABLE(of, rza1_irqc_dt_ids);
259259

260260
static struct platform_driver rza1_irqc_device_driver = {
261261
.probe = rza1_irqc_probe,
262-
.remove_new = rza1_irqc_remove,
262+
.remove = rza1_irqc_remove,
263263
.driver = {
264264
.name = "renesas_rza1_irqc",
265265
.of_match_table = rza1_irqc_dt_ids,

drivers/irqchip/irq-ts4800.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ MODULE_DEVICE_TABLE(of, ts4800_ic_of_match);
154154

155155
static struct platform_driver ts4800_ic_driver = {
156156
.probe = ts4800_ic_probe,
157-
.remove_new = ts4800_ic_remove,
157+
.remove = ts4800_ic_remove,
158158
.driver = {
159159
.name = "ts4800-irqc",
160160
.of_match_table = ts4800_ic_of_match,

0 commit comments

Comments
 (0)