mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-28 16:52:18 +00:00
net: Switch back to struct platform_driver::remove()
After commit 0edb555a65
("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: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Acked-by: Stefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
a208a39ed0
commit
46e338bbd7
@ -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
|
||||
|
@ -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",
|
||||
},
|
||||
|
@ -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",
|
||||
},
|
||||
|
@ -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",
|
||||
|
@ -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);
|
||||
|
||||
|
@ -3146,7 +3146,7 @@ static void sfp_shutdown(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver sfp_driver = {
|
||||
.probe = sfp_probe,
|
||||
.remove_new = sfp_remove,
|
||||
.remove = sfp_remove,
|
||||
.shutdown = sfp_shutdown,
|
||||
.driver = {
|
||||
.name = "sfp",
|
||||
|
@ -863,7 +863,7 @@ static struct platform_driver pef2256_driver = {
|
||||
.of_match_table = pef2256_id_table,
|
||||
},
|
||||
.probe = pef2256_probe,
|
||||
.remove_new = pef2256_remove,
|
||||
.remove = pef2256_remove,
|
||||
};
|
||||
module_platform_driver(pef2256_driver);
|
||||
|
||||
|
@ -799,7 +799,7 @@ static struct platform_driver qmc_hdlc_driver = {
|
||||
.of_match_table = qmc_hdlc_id_table,
|
||||
},
|
||||
.probe = qmc_hdlc_probe,
|
||||
.remove_new = qmc_hdlc_remove,
|
||||
.remove = qmc_hdlc_remove,
|
||||
};
|
||||
module_platform_driver(qmc_hdlc_driver);
|
||||
|
||||
|
@ -1290,7 +1290,7 @@ MODULE_DEVICE_TABLE(of, fsl_ucc_hdlc_of_match);
|
||||
|
||||
static struct platform_driver ucc_hdlc_driver = {
|
||||
.probe = ucc_hdlc_probe,
|
||||
.remove_new = ucc_hdlc_remove,
|
||||
.remove = ucc_hdlc_remove,
|
||||
.driver = {
|
||||
.name = DRV_NAME,
|
||||
.pm = HDLC_PM_OPS,
|
||||
|
@ -1534,7 +1534,7 @@ static void ixp4xx_hss_remove(struct platform_device *pdev)
|
||||
static struct platform_driver ixp4xx_hss_driver = {
|
||||
.driver.name = DRV_NAME,
|
||||
.probe = ixp4xx_hss_probe,
|
||||
.remove_new = ixp4xx_hss_remove,
|
||||
.remove = ixp4xx_hss_remove,
|
||||
};
|
||||
module_platform_driver(ixp4xx_hss_driver);
|
||||
|
||||
|
@ -896,7 +896,7 @@ MODULE_DEVICE_TABLE(of, bam_dmux_of_match);
|
||||
|
||||
static struct platform_driver bam_dmux_driver = {
|
||||
.probe = bam_dmux_probe,
|
||||
.remove_new = bam_dmux_remove,
|
||||
.remove = bam_dmux_remove,
|
||||
.driver = {
|
||||
.name = "bam-dmux",
|
||||
.pm = &bam_dmux_pm_ops,
|
||||
|
Loading…
Reference in New Issue
Block a user