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

net: ethernet: 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/ethernet 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>
Link: https://patch.msgid.link/18f7c585a1a8a8ac8b03a2fca7de19bd5c52ac2b.1727949050.git.u.kleine-koenig@baylibre.com


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

drivers/net/ethernet/8390/ax88796.c

+1 −1
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ static struct platform_driver axdrv = { 
		.name		= "ax88796",

	},

	.probe		= ax_probe,

	.remove_new	= ax_remove,

	.remove		= ax_remove,

	.suspend	= ax_suspend,

	.resume		= ax_resume,

};

drivers/net/ethernet/8390/mcf8390.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static struct platform_driver mcf8390_drv = { 
		.name	= "mcf8390",

	},

	.probe		= mcf8390_probe,

	.remove_new	= mcf8390_remove,

	.remove		= mcf8390_remove,

};



module_platform_driver(mcf8390_drv);

drivers/net/ethernet/8390/ne.c

+1 −1
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ static int ne_drv_resume(struct platform_device *pdev) 
#endif



static struct platform_driver ne_driver = {

	.remove_new	= ne_drv_remove,

	.remove		= ne_drv_remove,

	.suspend	= ne_drv_suspend,

	.resume		= ne_drv_resume,

	.driver		= {

drivers/net/ethernet/actions/owl-emac.c

+1 −1
Original line number Diff line number Diff line
@@ -1607,7 +1607,7 @@ static struct platform_driver owl_emac_driver = { 
		.pm = &owl_emac_pm_ops,

	},

	.probe = owl_emac_probe,

	.remove_new = owl_emac_remove,

	.remove = owl_emac_remove,

};

module_platform_driver(owl_emac_driver);

drivers/net/ethernet/aeroflex/greth.c

+1 −1
Original line number Diff line number Diff line
@@ -1564,7 +1564,7 @@ static struct platform_driver greth_of_driver = { 
		.of_match_table = greth_of_match,

	},

	.probe = greth_of_probe,

	.remove_new = greth_of_remove,

	.remove = greth_of_remove,

};



module_platform_driver(greth_of_driver);