Commit e70140ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 40384c84

arch/arm/common/locomo.c

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static void locomo_remove(struct platform_device *dev) 
 */

static struct platform_driver locomo_device_driver = {

	.probe		= locomo_probe,

	.remove_new	= locomo_remove,

	.remove		= locomo_remove,

#ifdef CONFIG_PM

	.suspend	= locomo_suspend,

	.resume		= locomo_resume,

arch/arm/common/sa1111.c

+1 −1
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ static struct dev_pm_ops sa1111_pm_ops = { 
 */

static struct platform_driver sa1111_device_driver = {

	.probe		= sa1111_probe,

	.remove_new	= sa1111_remove,

	.remove		= sa1111_remove,

	.driver		= {

		.name	= "sa1111",

		.pm	= &sa1111_pm_ops,

arch/arm/common/scoop.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static void scoop_remove(struct platform_device *pdev) 


static struct platform_driver scoop_driver = {

	.probe		= scoop_probe,

	.remove_new	= scoop_remove,

	.remove		= scoop_remove,

	.suspend	= scoop_suspend,

	.resume		= scoop_resume,

	.driver		= {

arch/arm/mach-imx/mmdc.c

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ static struct platform_driver imx_mmdc_driver = { 
		.of_match_table = imx_mmdc_dt_ids,

	},

	.probe		= imx_mmdc_probe,

	.remove_new	= imx_mmdc_remove,

	.remove		= imx_mmdc_remove,

};



static int __init imx_mmdc_init(void)

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

+1 −1
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ static void omap_system_dma_remove(struct platform_device *pdev) 


static struct platform_driver omap_system_dma_driver = {

	.probe		= omap_system_dma_probe,

	.remove_new	= omap_system_dma_remove,

	.remove		= omap_system_dma_remove,

	.driver		= {

		.name	= "omap_dma_system"

	},