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

net: 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 after the previous
conversion commits apart from the wireless 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>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarSergey Ryazanov <ryazanov.s.a@gmail.com>
Acked-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a208a39e

drivers/net/fjes/fjes_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1466,7 +1466,7 @@ static struct platform_driver fjes_driver = { 
		.name = DRV_NAME,

	},

	.probe = fjes_probe,

	.remove_new = fjes_remove,

	.remove = fjes_remove,

};



static acpi_status

drivers/net/ieee802154/fakelb.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static struct platform_device *ieee802154fake_dev; 


static struct platform_driver ieee802154fake_driver = {

	.probe = fakelb_probe,

	.remove_new = fakelb_remove,

	.remove = fakelb_remove,

	.driver = {

			.name = "ieee802154fakelb",

	},

drivers/net/ieee802154/mac802154_hwsim.c

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


static struct platform_driver mac802154hwsim_driver = {

	.probe = hwsim_probe,

	.remove_new = hwsim_remove,

	.remove = hwsim_remove,

	.driver = {

			.name = "mac802154_hwsim",

	},

drivers/net/ipa/ipa_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ static const struct attribute_group *ipa_attribute_groups[] = { 


static struct platform_driver ipa_driver = {

	.probe		= ipa_probe,

	.remove_new	= ipa_remove,

	.remove		= ipa_remove,

	.shutdown	= ipa_remove,

	.driver	= {

		.name		= "ipa",

drivers/net/pcs/pcs-rzn1-miic.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static struct platform_driver miic_driver = { 
		.of_match_table = miic_of_mtable,

	},

	.probe = miic_probe,

	.remove_new = miic_remove,

	.remove = miic_remove,

};

module_platform_driver(miic_driver);