Commit 221013af authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Marc Kleine-Budde
Browse files

can: 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 can drivers 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/20240909072742.381003-2-u.kleine-koenig@baylibre.com


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent f3b6129b

drivers/net/can/at91_can.c

+1 −1
Original line number Diff line number Diff line
@@ -1191,7 +1191,7 @@ MODULE_DEVICE_TABLE(platform, at91_can_id_table); 


static struct platform_driver at91_can_driver = {

	.probe = at91_can_probe,

	.remove_new = at91_can_remove,

	.remove = at91_can_remove,

	.driver = {

		.name = KBUILD_MODNAME,

		.of_match_table = of_match_ptr(at91_can_dt_ids),

drivers/net/can/bxcan.c

+1 −1
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ static struct platform_driver bxcan_driver = { 
		.of_match_table = bxcan_of_match,

	},

	.probe = bxcan_probe,

	.remove_new = bxcan_remove,

	.remove = bxcan_remove,

};



module_platform_driver(bxcan_driver);

drivers/net/can/c_can/c_can_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static struct platform_driver c_can_plat_driver = { 
		.of_match_table = c_can_of_table,

	},

	.probe = c_can_plat_probe,

	.remove_new = c_can_plat_remove,

	.remove = c_can_plat_remove,

	.suspend = c_can_suspend,

	.resume = c_can_resume,

	.id_table = c_can_id_table,

drivers/net/can/cc770/cc770_isa.c

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


static struct platform_driver cc770_isa_driver = {

	.probe = cc770_isa_probe,

	.remove_new = cc770_isa_remove,

	.remove = cc770_isa_remove,

	.driver = {

		.name = KBUILD_MODNAME,

	},

drivers/net/can/cc770/cc770_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static struct platform_driver cc770_platform_driver = { 
		.of_match_table = cc770_platform_table,

	},

	.probe = cc770_platform_probe,

	.remove_new = cc770_platform_remove,

	.remove = cc770_platform_remove,

};



module_platform_driver(cc770_platform_driver);