Commit f8470006 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Miquel Raynal
Browse files

mtd: Switch back to struct platform_driver::remove() 



After commit 0edb555a ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.

Convert all platform drivers below drivers/mtd 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: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20241007205803.444994-10-u.kleine-koenig@baylibre.com
parent 4c9b44e7

drivers/mtd/devices/bcm47xxsflash.c

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


static struct platform_driver bcma_sflash_driver = {

	.probe	= bcm47xxsflash_bcma_probe,

	.remove_new = bcm47xxsflash_bcma_remove,

	.remove = bcm47xxsflash_bcma_remove,

	.driver = {

		.name = "bcma_sflash",

	},

drivers/mtd/devices/docg3.c

+1 −1
Original line number Diff line number Diff line
@@ -2075,7 +2075,7 @@ static struct platform_driver g3_driver = { 
	},

	.suspend	= docg3_suspend,

	.resume		= docg3_resume,

	.remove_new	= docg3_release,

	.remove		= docg3_release,

};



module_platform_driver_probe(g3_driver, docg3_probe);

drivers/mtd/devices/phram.c

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


static struct platform_driver phram_driver = {

	.probe		= phram_probe,

	.remove_new	= phram_remove,

	.remove		= phram_remove,

	.driver		= {

		.name		= "phram",

		.of_match_table	= of_match_ptr(phram_of_match),

drivers/mtd/devices/powernv_flash.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static struct platform_driver powernv_flash_driver = { 
		.name		= "powernv_flash",

		.of_match_table	= powernv_flash_match,

	},

	.remove_new	= powernv_flash_release,

	.remove		= powernv_flash_release,

	.probe		= powernv_flash_probe,

};

drivers/mtd/devices/spear_smi.c

+1 −1
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ static struct platform_driver spear_smi_driver = { 
		.pm = &spear_smi_pm_ops,

	},

	.probe = spear_smi_probe,

	.remove_new = spear_smi_remove,

	.remove = spear_smi_remove,

};

module_platform_driver(spear_smi_driver);