Skip to content

Commit e70140b

Browse files
torvaldstorvalds
committed
Get rid of 'remove_new' relic from platform driver struct
The continual trickle of small conversion patches is grating on me, and is really not helping. Just get rid of the 'remove_new' member function, which is just an alias for the plain 'remove', and had a comment to that effect: /* * .remove_new() is a relic from a prototype conversion of .remove(). * New drivers are supposed to implement .remove(). Once all drivers are * converted to not use .remove_new any more, it will be dropped. */ This was just a tree-wide 'sed' script that replaced '.remove_new' with '.remove', with some care taken to turn a subsequent tab into two tabs to make things line up. I did do some minimal manual whitespace adjustment for places that used spaces to line things up. Then I just removed the old (sic) .remove_new member function, and this is the end result. No more unnecessary conversion noise. Signed-off-by: Linus Torvalds <[email protected]>
1 parent 40384c8 commit e70140b

File tree

474 files changed

+484
-494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

474 files changed

+484
-494
lines changed

‎arch/arm/common/locomo.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ static void locomo_remove(struct platform_device *dev)
516516
*/
517517
static struct platform_driver locomo_device_driver = {
518518
.probe = locomo_probe,
519-
.remove_new = locomo_remove,
519+
.remove = locomo_remove,
520520
#ifdef CONFIG_PM
521521
.suspend = locomo_suspend,
522522
.resume = locomo_resume,

‎arch/arm/common/sa1111.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ static struct dev_pm_ops sa1111_pm_ops = {
11541154
*/
11551155
static struct platform_driver sa1111_device_driver = {
11561156
.probe = sa1111_probe,
1157-
.remove_new = sa1111_remove,
1157+
.remove = sa1111_remove,
11581158
.driver = {
11591159
.name = "sa1111",
11601160
.pm = &sa1111_pm_ops,

‎arch/arm/common/scoop.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ static void scoop_remove(struct platform_device *pdev)
250250

251251
static struct platform_driver scoop_driver = {
252252
.probe = scoop_probe,
253-
.remove_new = scoop_remove,
253+
.remove = scoop_remove,
254254
.suspend = scoop_suspend,
255255
.resume = scoop_resume,
256256
.driver = {

‎arch/arm/mach-imx/mmdc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ static struct platform_driver imx_mmdc_driver = {
596596
.of_match_table = imx_mmdc_dt_ids,
597597
},
598598
.probe = imx_mmdc_probe,
599-
.remove_new = imx_mmdc_remove,
599+
.remove = imx_mmdc_remove,
600600
};
601601

602602
static int __init imx_mmdc_init(void)

‎arch/arm/mach-omap1/omap-dma.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ static void omap_system_dma_remove(struct platform_device *pdev)
832832

833833
static struct platform_driver omap_system_dma_driver = {
834834
.probe = omap_system_dma_probe,
835-
.remove_new = omap_system_dma_remove,
835+
.remove = omap_system_dma_remove,
836836
.driver = {
837837
.name = "omap_dma_system"
838838
},

‎arch/arm/mach-pxa/sharpsl_pm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ static void sharpsl_pm_remove(struct platform_device *pdev)
919919

920920
static struct platform_driver sharpsl_pm_driver = {
921921
.probe = sharpsl_pm_probe,
922-
.remove_new = sharpsl_pm_remove,
922+
.remove = sharpsl_pm_remove,
923923
.suspend = sharpsl_pm_suspend,
924924
.resume = sharpsl_pm_resume,
925925
.driver = {

‎arch/arm/mach-sa1100/jornada720_ssp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ static void jornada_ssp_remove(struct platform_device *dev)
188188

189189
struct platform_driver jornadassp_driver = {
190190
.probe = jornada_ssp_probe,
191-
.remove_new = jornada_ssp_remove,
191+
.remove = jornada_ssp_remove,
192192
.driver = {
193193
.name = "jornada_ssp",
194194
},

‎arch/arm/mach-sa1100/neponset.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ static const struct dev_pm_ops neponset_pm_ops = {
423423

424424
static struct platform_driver neponset_device_driver = {
425425
.probe = neponset_probe,
426-
.remove_new = neponset_remove,
426+
.remove = neponset_remove,
427427
.driver = {
428428
.name = "neponset",
429429
.pm = PM_OPS,

‎arch/mips/pci/pci-xtalk-bridge.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ static void bridge_remove(struct platform_device *pdev)
749749

750750
static struct platform_driver bridge_driver = {
751751
.probe = bridge_probe,
752-
.remove_new = bridge_remove,
752+
.remove = bridge_remove,
753753
.driver = {
754754
.name = "xtalk-bridge",
755755
}

‎arch/sh/drivers/push-switch.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static void switch_drv_remove(struct platform_device *pdev)
110110

111111
static struct platform_driver switch_driver = {
112112
.probe = switch_drv_probe,
113-
.remove_new = switch_drv_remove,
113+
.remove = switch_drv_remove,
114114
.driver = {
115115
.name = DRV_NAME,
116116
},

‎arch/sparc/include/asm/parport_64.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ static struct platform_driver ecpp_driver = {
243243
.of_match_table = ecpp_match,
244244
},
245245
.probe = ecpp_probe,
246-
.remove_new = ecpp_remove,
246+
.remove = ecpp_remove,
247247
};
248248

249249
static int parport_pc_find_nonpci_ports(int autoirq, int autodma)

‎arch/sparc/kernel/chmc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ static struct platform_driver us3mc_driver = {
814814
.of_match_table = us3mc_match,
815815
},
816816
.probe = us3mc_probe,
817-
.remove_new = us3mc_remove,
817+
.remove = us3mc_remove,
818818
};
819819

820820
static inline bool us3mc_platform(void)

‎arch/um/drivers/rtc_kern.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ static void uml_rtc_remove(struct platform_device *pdev)
176176

177177
static struct platform_driver uml_rtc_driver = {
178178
.probe = uml_rtc_probe,
179-
.remove_new = uml_rtc_remove,
179+
.remove = uml_rtc_remove,
180180
.driver = {
181181
.name = "uml-rtc",
182182
},

‎arch/um/drivers/virtio_uml.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1465,7 +1465,7 @@ static int virtio_uml_resume(struct platform_device *pdev)
14651465

14661466
static struct platform_driver virtio_uml_driver = {
14671467
.probe = virtio_uml_probe,
1468-
.remove_new = virtio_uml_remove,
1468+
.remove = virtio_uml_remove,
14691469
.driver = {
14701470
.name = "virtio-uml",
14711471
.of_match_table = virtio_uml_match,

‎drivers/atm/fore200e.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2569,7 +2569,7 @@ static struct platform_driver fore200e_sba_driver = {
25692569
.of_match_table = fore200e_sba_match,
25702570
},
25712571
.probe = fore200e_sba_probe,
2572-
.remove_new = fore200e_sba_remove,
2572+
.remove = fore200e_sba_remove,
25732573
};
25742574
#endif
25752575

‎drivers/auxdisplay/cfag12864bfb.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static void cfag12864bfb_remove(struct platform_device *device)
108108

109109
static struct platform_driver cfag12864bfb_driver = {
110110
.probe = cfag12864bfb_probe,
111-
.remove_new = cfag12864bfb_remove,
111+
.remove = cfag12864bfb_remove,
112112
.driver = {
113113
.name = CFAG12864BFB_NAME,
114114
},

‎drivers/auxdisplay/hd44780.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ MODULE_DEVICE_TABLE(of, hd44780_of_match);
339339

340340
static struct platform_driver hd44780_driver = {
341341
.probe = hd44780_probe,
342-
.remove_new = hd44780_remove,
342+
.remove = hd44780_remove,
343343
.driver = {
344344
.name = "hd44780",
345345
.of_match_table = hd44780_of_match,

‎drivers/auxdisplay/img-ascii-lcd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ static struct platform_driver img_ascii_lcd_driver = {
291291
.of_match_table = img_ascii_lcd_matches,
292292
},
293293
.probe = img_ascii_lcd_probe,
294-
.remove_new = img_ascii_lcd_remove,
294+
.remove = img_ascii_lcd_remove,
295295
};
296296
module_platform_driver(img_ascii_lcd_driver);
297297

‎drivers/auxdisplay/seg-led-gpio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ MODULE_DEVICE_TABLE(of, seg_led_of_match);
9797

9898
static struct platform_driver seg_led_driver = {
9999
.probe = seg_led_probe,
100-
.remove_new = seg_led_remove,
100+
.remove = seg_led_remove,
101101
.driver = {
102102
.name = "seg-led-gpio",
103103
.of_match_table = seg_led_of_match,

‎drivers/bcma/host_soc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ static struct platform_driver bcma_host_soc_driver = {
261261
.of_match_table = bcma_host_soc_of_match,
262262
},
263263
.probe = bcma_host_soc_probe,
264-
.remove_new = bcma_host_soc_remove,
264+
.remove = bcma_host_soc_remove,
265265
};
266266

267267
int __init bcma_host_soc_register_driver(void)

‎drivers/block/swim.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ static void swim_remove(struct platform_device *dev)
944944

945945
static struct platform_driver swim_driver = {
946946
.probe = swim_probe,
947-
.remove_new = swim_remove,
947+
.remove = swim_remove,
948948
.driver = {
949949
.name = CARDNAME,
950950
},

‎drivers/bluetooth/btqcomsmd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ MODULE_DEVICE_TABLE(of, btqcomsmd_of_match);
216216

217217
static struct platform_driver btqcomsmd_driver = {
218218
.probe = btqcomsmd_probe,
219-
.remove_new = btqcomsmd_remove,
219+
.remove = btqcomsmd_remove,
220220
.driver = {
221221
.name = "btqcomsmd",
222222
.of_match_table = btqcomsmd_of_match,

‎drivers/bluetooth/hci_bcm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@ static const struct dev_pm_ops bcm_pm_ops = {
14981498

14991499
static struct platform_driver bcm_driver = {
15001500
.probe = bcm_probe,
1501-
.remove_new = bcm_remove,
1501+
.remove = bcm_remove,
15021502
.driver = {
15031503
.name = "hci_bcm",
15041504
.acpi_match_table = ACPI_PTR(bcm_acpi_match),

‎drivers/bluetooth/hci_intel.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ static void intel_remove(struct platform_device *pdev)
12061206

12071207
static struct platform_driver intel_driver = {
12081208
.probe = intel_probe,
1209-
.remove_new = intel_remove,
1209+
.remove = intel_remove,
12101210
.driver = {
12111211
.name = "hci_intel",
12121212
.acpi_match_table = ACPI_PTR(intel_acpi_match),

‎drivers/cdrom/gdrom.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ static void remove_gdrom(struct platform_device *devptr)
847847

848848
static struct platform_driver gdrom_driver = {
849849
.probe = probe_gdrom,
850-
.remove_new = remove_gdrom,
850+
.remove = remove_gdrom,
851851
.driver = {
852852
.name = GDROM_DEV_NAME,
853853
},

‎drivers/cdx/controller/cdx_controller.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ static struct platform_driver cdx_pdriver = {
250250
.of_match_table = cdx_match_table,
251251
},
252252
.probe = xlnx_cdx_probe,
253-
.remove_new = xlnx_cdx_remove,
253+
.remove = xlnx_cdx_remove,
254254
};
255255

256256
static int __init cdx_controller_init(void)

‎drivers/char/ipmi/bt-bmc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ static struct platform_driver bt_bmc_driver = {
481481
.of_match_table = bt_bmc_match,
482482
},
483483
.probe = bt_bmc_probe,
484-
.remove_new = bt_bmc_remove,
484+
.remove = bt_bmc_remove,
485485
};
486486

487487
module_platform_driver(bt_bmc_driver);

‎drivers/char/ipmi/ipmi_powernv.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ static struct platform_driver powernv_ipmi_driver = {
302302
.of_match_table = ipmi_powernv_match,
303303
},
304304
.probe = ipmi_powernv_probe,
305-
.remove_new = ipmi_powernv_remove,
305+
.remove = ipmi_powernv_remove,
306306
};
307307

308308

‎drivers/char/ipmi/ipmi_si_platform.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ struct platform_driver ipmi_platform_driver = {
445445
.acpi_match_table = ACPI_PTR(acpi_ipmi_match),
446446
},
447447
.probe = ipmi_probe,
448-
.remove_new = ipmi_remove,
448+
.remove = ipmi_remove,
449449
.id_table = si_plat_ids
450450
};
451451

‎drivers/char/ipmi/ipmi_ssif.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2114,7 +2114,7 @@ static struct platform_driver ipmi_driver = {
21142114
.name = DEVICE_NAME,
21152115
},
21162116
.probe = ssif_platform_probe,
2117-
.remove_new = ssif_platform_remove,
2117+
.remove = ssif_platform_remove,
21182118
.id_table = ssif_plat_ids
21192119
};
21202120

‎drivers/char/ipmi/kcs_bmc_aspeed.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ static struct platform_driver ast_kcs_bmc_driver = {
672672
.of_match_table = ast_kcs_bmc_match,
673673
},
674674
.probe = aspeed_kcs_probe,
675-
.remove_new = aspeed_kcs_remove,
675+
.remove = aspeed_kcs_remove,
676676
};
677677
module_platform_driver(ast_kcs_bmc_driver);
678678

‎drivers/char/ipmi/kcs_bmc_npcm7xx.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ static struct platform_driver npcm_kcs_bmc_driver = {
241241
.of_match_table = npcm_kcs_bmc_match,
242242
},
243243
.probe = npcm7xx_kcs_probe,
244-
.remove_new = npcm7xx_kcs_remove,
244+
.remove = npcm7xx_kcs_remove,
245245
};
246246
module_platform_driver(npcm_kcs_bmc_driver);
247247

‎drivers/char/tpm/tpm_ftpm_tee.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ static struct platform_driver ftpm_tee_plat_driver = {
366366
},
367367
.shutdown = ftpm_plat_tee_shutdown,
368368
.probe = ftpm_plat_tee_probe,
369-
.remove_new = ftpm_plat_tee_remove,
369+
.remove = ftpm_plat_tee_remove,
370370
};
371371

372372
/* UUID of the fTPM TA */

‎drivers/char/tpm/tpm_tis.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ MODULE_DEVICE_TABLE(of, tis_of_platform_match);
356356

357357
static struct platform_driver tis_drv = {
358358
.probe = tpm_tis_plat_probe,
359-
.remove_new = tpm_tis_plat_remove,
359+
.remove = tpm_tis_plat_remove,
360360
.driver = {
361361
.name = "tpm_tis",
362362
.pm = &tpm_tis_pm,

‎drivers/char/tpm/tpm_tis_synquacer.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ MODULE_DEVICE_TABLE(acpi, tpm_synquacer_acpi_tbl);
152152

153153
static struct platform_driver tis_synquacer_drv = {
154154
.probe = tpm_tis_synquacer_probe,
155-
.remove_new = tpm_tis_synquacer_remove,
155+
.remove = tpm_tis_synquacer_remove,
156156
.driver = {
157157
.name = "tpm_tis_synquacer",
158158
.pm = &tpm_tis_synquacer_pm,

‎drivers/clocksource/timer-sun5i.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ MODULE_DEVICE_TABLE(of, sun5i_timer_of_match);
318318

319319
static struct platform_driver sun5i_timer_driver = {
320320
.probe = sun5i_timer_probe,
321-
.remove_new = sun5i_timer_remove,
321+
.remove = sun5i_timer_remove,
322322
.driver = {
323323
.name = "sun5i-timer",
324324
.of_match_table = sun5i_timer_of_match,

‎drivers/clocksource/timer-tegra186.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ static struct platform_driver tegra186_wdt_driver = {
502502
.of_match_table = tegra186_timer_of_match,
503503
},
504504
.probe = tegra186_timer_probe,
505-
.remove_new = tegra186_timer_remove,
505+
.remove = tegra186_timer_remove,
506506
};
507507
module_platform_driver(tegra186_wdt_driver);
508508

‎drivers/clocksource/timer-ti-dm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,7 @@ MODULE_DEVICE_TABLE(of, omap_timer_match);
12951295

12961296
static struct platform_driver omap_dm_timer_driver = {
12971297
.probe = omap_dm_timer_probe,
1298-
.remove_new = omap_dm_timer_remove,
1298+
.remove = omap_dm_timer_remove,
12991299
.driver = {
13001300
.name = "omap_timer",
13011301
.of_match_table = omap_timer_match,

‎drivers/counter/ti-ecap-capture.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ MODULE_DEVICE_TABLE(of, ecap_cnt_of_match);
603603

604604
static struct platform_driver ecap_cnt_driver = {
605605
.probe = ecap_cnt_probe,
606-
.remove_new = ecap_cnt_remove,
606+
.remove = ecap_cnt_remove,
607607
.driver = {
608608
.name = "ecap-capture",
609609
.of_match_table = ecap_cnt_of_match,

‎drivers/counter/ti-eqep.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ MODULE_DEVICE_TABLE(of, ti_eqep_of_match);
548548

549549
static struct platform_driver ti_eqep_driver = {
550550
.probe = ti_eqep_probe,
551-
.remove_new = ti_eqep_remove,
551+
.remove = ti_eqep_remove,
552552
.driver = {
553553
.name = "ti-eqep-cnt",
554554
.of_match_table = ti_eqep_of_match,

‎drivers/cpuidle/cpuidle-kirkwood.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static void kirkwood_cpuidle_remove(struct platform_device *pdev)
6666

6767
static struct platform_driver kirkwood_cpuidle_driver = {
6868
.probe = kirkwood_cpuidle_probe,
69-
.remove_new = kirkwood_cpuidle_remove,
69+
.remove = kirkwood_cpuidle_remove,
7070
.driver = {
7171
.name = "kirkwood_cpuidle",
7272
},

‎drivers/devfreq/event/exynos-nocp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ static void exynos_nocp_remove(struct platform_device *pdev)
284284

285285
static struct platform_driver exynos_nocp_driver = {
286286
.probe = exynos_nocp_probe,
287-
.remove_new = exynos_nocp_remove,
287+
.remove = exynos_nocp_remove,
288288
.driver = {
289289
.name = "exynos-nocp",
290290
.of_match_table = exynos_nocp_id_match,

‎drivers/devfreq/event/exynos-ppmu.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ static void exynos_ppmu_remove(struct platform_device *pdev)
701701

702702
static struct platform_driver exynos_ppmu_driver = {
703703
.probe = exynos_ppmu_probe,
704-
.remove_new = exynos_ppmu_remove,
704+
.remove = exynos_ppmu_remove,
705705
.driver = {
706706
.name = "exynos-ppmu",
707707
.of_match_table = exynos_ppmu_id_match,

‎drivers/devfreq/mtk-cci-devfreq.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ MODULE_DEVICE_TABLE(of, mtk_ccifreq_machines);
430430

431431
static struct platform_driver mtk_ccifreq_platdrv = {
432432
.probe = mtk_ccifreq_probe,
433-
.remove_new = mtk_ccifreq_remove,
433+
.remove = mtk_ccifreq_remove,
434434
.driver = {
435435
.name = "mtk-ccifreq",
436436
.of_match_table = mtk_ccifreq_machines,

0 commit comments

Comments
 (0)