Skip to content

Commit e70140b

Browse files
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 <torvalds@linux-foundation.org>
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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
},

0 commit comments

Comments
 (0)