Commit a208a39e authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Jakub Kicinski
Browse files

net: mdio: 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/net/mdio 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>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/0b60d8bfc45a3de8193f953794dda241e11032a9.1727949050.git.u.kleine-koenig@baylibre.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4818016d

drivers/net/mdio/mdio-aspeed.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static struct platform_driver aspeed_mdio_driver = { 
		.of_match_table = aspeed_mdio_of_match,

	},

	.probe = aspeed_mdio_probe,

	.remove_new = aspeed_mdio_remove,

	.remove = aspeed_mdio_remove,

};



module_platform_driver(aspeed_mdio_driver);

drivers/net/mdio/mdio-bcm-iproc.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static struct platform_driver iproc_mdio_driver = { 
#endif

	},

	.probe = iproc_mdio_probe,

	.remove_new = iproc_mdio_remove,

	.remove = iproc_mdio_remove,

};



module_platform_driver(iproc_mdio_driver);

drivers/net/mdio/mdio-bcm-unimac.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static struct platform_driver unimac_mdio_driver = { 
		.pm = &unimac_mdio_pm_ops,

	},

	.probe	= unimac_mdio_probe,

	.remove_new = unimac_mdio_remove,

	.remove = unimac_mdio_remove,

};

module_platform_driver(unimac_mdio_driver);

drivers/net/mdio/mdio-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ MODULE_DEVICE_TABLE(of, mdio_gpio_of_match); 


static struct platform_driver mdio_gpio_driver = {

	.probe = mdio_gpio_probe,

	.remove_new = mdio_gpio_remove,

	.remove = mdio_gpio_remove,

	.driver		= {

		.name	= "mdio-gpio",

		.of_match_table = mdio_gpio_of_match,

drivers/net/mdio/mdio-hisi-femac.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ MODULE_DEVICE_TABLE(of, hisi_femac_mdio_dt_ids); 


static struct platform_driver hisi_femac_mdio_driver = {

	.probe = hisi_femac_mdio_probe,

	.remove_new = hisi_femac_mdio_remove,

	.remove = hisi_femac_mdio_remove,

	.driver = {

		.name = "hisi-femac-mdio",

		.of_match_table = hisi_femac_mdio_dt_ids,