Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: Switch back to struct platform_driver::remove()

After commit 0edb555a65d1 ("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>

authored by

Uwe Kleine-König and committed by
Jakub Kicinski
46e338bb a208a39e

+11 -11
+1 -1
drivers/net/fjes/fjes_main.c
··· 1466 1466 .name = DRV_NAME, 1467 1467 }, 1468 1468 .probe = fjes_probe, 1469 - .remove_new = fjes_remove, 1469 + .remove = fjes_remove, 1470 1470 }; 1471 1471 1472 1472 static acpi_status
+1 -1
drivers/net/ieee802154/fakelb.c
··· 235 235 236 236 static struct platform_driver ieee802154fake_driver = { 237 237 .probe = fakelb_probe, 238 - .remove_new = fakelb_remove, 238 + .remove = fakelb_remove, 239 239 .driver = { 240 240 .name = "ieee802154fakelb", 241 241 },
+1 -1
drivers/net/ieee802154/mac802154_hwsim.c
··· 1047 1047 1048 1048 static struct platform_driver mac802154hwsim_driver = { 1049 1049 .probe = hwsim_probe, 1050 - .remove_new = hwsim_remove, 1050 + .remove = hwsim_remove, 1051 1051 .driver = { 1052 1052 .name = "mac802154_hwsim", 1053 1053 },
+1 -1
drivers/net/ipa/ipa_main.c
··· 1012 1012 1013 1013 static struct platform_driver ipa_driver = { 1014 1014 .probe = ipa_probe, 1015 - .remove_new = ipa_remove, 1015 + .remove = ipa_remove, 1016 1016 .shutdown = ipa_remove, 1017 1017 .driver = { 1018 1018 .name = "ipa",
+1 -1
drivers/net/pcs/pcs-rzn1-miic.c
··· 552 552 .of_match_table = miic_of_mtable, 553 553 }, 554 554 .probe = miic_probe, 555 - .remove_new = miic_remove, 555 + .remove = miic_remove, 556 556 }; 557 557 module_platform_driver(miic_driver); 558 558
+1 -1
drivers/net/phy/sfp.c
··· 3146 3146 3147 3147 static struct platform_driver sfp_driver = { 3148 3148 .probe = sfp_probe, 3149 - .remove_new = sfp_remove, 3149 + .remove = sfp_remove, 3150 3150 .shutdown = sfp_shutdown, 3151 3151 .driver = { 3152 3152 .name = "sfp",
+1 -1
drivers/net/wan/framer/pef2256/pef2256.c
··· 863 863 .of_match_table = pef2256_id_table, 864 864 }, 865 865 .probe = pef2256_probe, 866 - .remove_new = pef2256_remove, 866 + .remove = pef2256_remove, 867 867 }; 868 868 module_platform_driver(pef2256_driver); 869 869
+1 -1
drivers/net/wan/fsl_qmc_hdlc.c
··· 799 799 .of_match_table = qmc_hdlc_id_table, 800 800 }, 801 801 .probe = qmc_hdlc_probe, 802 - .remove_new = qmc_hdlc_remove, 802 + .remove = qmc_hdlc_remove, 803 803 }; 804 804 module_platform_driver(qmc_hdlc_driver); 805 805
+1 -1
drivers/net/wan/fsl_ucc_hdlc.c
··· 1290 1290 1291 1291 static struct platform_driver ucc_hdlc_driver = { 1292 1292 .probe = ucc_hdlc_probe, 1293 - .remove_new = ucc_hdlc_remove, 1293 + .remove = ucc_hdlc_remove, 1294 1294 .driver = { 1295 1295 .name = DRV_NAME, 1296 1296 .pm = HDLC_PM_OPS,
+1 -1
drivers/net/wan/ixp4xx_hss.c
··· 1534 1534 static struct platform_driver ixp4xx_hss_driver = { 1535 1535 .driver.name = DRV_NAME, 1536 1536 .probe = ixp4xx_hss_probe, 1537 - .remove_new = ixp4xx_hss_remove, 1537 + .remove = ixp4xx_hss_remove, 1538 1538 }; 1539 1539 module_platform_driver(ixp4xx_hss_driver); 1540 1540
+1 -1
drivers/net/wwan/qcom_bam_dmux.c
··· 896 896 897 897 static struct platform_driver bam_dmux_driver = { 898 898 .probe = bam_dmux_probe, 899 - .remove_new = bam_dmux_remove, 899 + .remove = bam_dmux_remove, 900 900 .driver = { 901 901 .name = "bam-dmux", 902 902 .pm = &bam_dmux_pm_ops,