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

net: dsa: 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/dsa 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/36da477cb9fa0bffec32d50c2cf3d18e94a0e7e3.1727949050.git.u.kleine-koenig@baylibre.com


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

drivers/net/dsa/b53/b53_mmap.c

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


static struct platform_driver b53_mmap_driver = {

	.probe = b53_mmap_probe,

	.remove_new = b53_mmap_remove,

	.remove = b53_mmap_remove,

	.shutdown = b53_mmap_shutdown,

	.driver = {

		.name = "b53-switch",

drivers/net/dsa/b53/b53_srab.c

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


static struct platform_driver b53_srab_driver = {

	.probe = b53_srab_probe,

	.remove_new = b53_srab_remove,

	.remove = b53_srab_remove,

	.shutdown = b53_srab_shutdown,

	.driver = {

		.name = "b53-srab-switch",

drivers/net/dsa/bcm_sf2.c

+1 −1
Original line number Diff line number Diff line
@@ -1623,7 +1623,7 @@ static SIMPLE_DEV_PM_OPS(bcm_sf2_pm_ops, 


static struct platform_driver bcm_sf2_driver = {

	.probe	= bcm_sf2_sw_probe,

	.remove_new = bcm_sf2_sw_remove,

	.remove = bcm_sf2_sw_remove,

	.shutdown = bcm_sf2_sw_shutdown,

	.driver = {

		.name = "brcm-sf2",

drivers/net/dsa/hirschmann/hellcreek.c

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


static struct platform_driver hellcreek_driver = {

	.probe	= hellcreek_probe,

	.remove_new = hellcreek_remove,

	.remove = hellcreek_remove,

	.shutdown = hellcreek_shutdown,

	.driver = {

		.name = "hellcreek",

drivers/net/dsa/lantiq_gswip.c

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


static struct platform_driver gswip_driver = {

	.probe = gswip_probe,

	.remove_new = gswip_remove,

	.remove = gswip_remove,

	.shutdown = gswip_shutdown,

	.driver = {

		.name = "gswip",