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>

diff --git a/drivers/net/fjes/fjes_main.c b/drivers/net/fjes/fjes_main.c
index fad5b65644645ded60601d4a15ef606ef19b3a13..4a4ed2ccf72ff2f13359e53fa176496237451a44 100644 (file)
--- a/drivers/net/fjes/fjes_main.c
+++ b/drivers/net/fjes/fjes_main.c
@@ -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

diff --git a/drivers/net/ieee802154/fakelb.c b/drivers/net/ieee802154/fakelb.c
index 2930141d7dd2d30201e4bd1d4492cbd681fb7c0a..e11d8eda85ea11aa5b434cc3ba13437a8d1a7b8c 100644 (file)
--- a/drivers/net/ieee802154/fakelb.c
+++ b/drivers/net/ieee802154/fakelb.c
@@ -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",
        },

diff --git a/drivers/net/ieee802154/mac802154_hwsim.c b/drivers/net/ieee802154/mac802154_hwsim.c
index 2c2483bbe780aa905acb16784cf6cb43e3af6237..1cab20b5a885cff74b84dfa3daa892eec4cf023c 100644 (file)
--- a/drivers/net/ieee802154/mac802154_hwsim.c
+++ b/drivers/net/ieee802154/mac802154_hwsim.c
@@ -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",
        },

diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c
index 5f3dd5a2dcf46cb6734b04792ca164ff847cff07..f25f6e2cf58cc30774e2414e388d3a3c69b16ae6 100644 (file)
--- a/drivers/net/ipa/ipa_main.c
+++ b/drivers/net/ipa/ipa_main.c
@@ -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",

diff --git a/drivers/net/pcs/pcs-rzn1-miic.c b/drivers/net/pcs/pcs-rzn1-miic.c
index d0a722d43368f7ecb1e2813de299fb7ac09929a7..61944574d087d4169f4ca2d223c525054cfc6e73 100644 (file)
--- a/drivers/net/pcs/pcs-rzn1-miic.c
+++ b/drivers/net/pcs/pcs-rzn1-miic.c
@@ -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);
 

diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index a5684ef5884bda2690a6a1e173b0250bbe1b3f10..7851bfad35722c6381de63abb6c0264e4adbde10 100644 (file)
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -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",

diff --git a/drivers/net/wan/framer/pef2256/pef2256.c b/drivers/net/wan/framer/pef2256/pef2256.c
index 413a3c1d15bbe87c508d082753ac0976be5f3d40..1e4c8e85d598d2401ff0f83b079f72d4932f0931 100644 (file)
--- a/drivers/net/wan/framer/pef2256/pef2256.c
+++ b/drivers/net/wan/framer/pef2256/pef2256.c
@@ -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);
 

diff --git a/drivers/net/wan/fsl_qmc_hdlc.c b/drivers/net/wan/fsl_qmc_hdlc.c
index 8fcfbde31a1c66db1e036cee5151a9b8e58f3c91..8976dea8e17e2c9e0d7add3b8ac78ac858fc5120 100644 (file)
--- a/drivers/net/wan/fsl_qmc_hdlc.c
+++ b/drivers/net/wan/fsl_qmc_hdlc.c
@@ -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);
 

diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c
index 605e70f7baace46b38b64a50f328609a0000f81f..f999798a561271f018a921847714543a01512a92 100644 (file)
--- a/drivers/net/wan/fsl_ucc_hdlc.c
+++ b/drivers/net/wan/fsl_ucc_hdlc.c
@@ -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,

diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
index 931c5ca79ea5e4428de2c193ae54f6750c81e288..720c5dc889ea322be63b8a47508b57a5a071a0c5 100644 (file)
--- a/drivers/net/wan/ixp4xx_hss.c
+++ b/drivers/net/wan/ixp4xx_hss.c
@@ -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);
 

diff --git a/drivers/net/wwan/qcom_bam_dmux.c b/drivers/net/wwan/qcom_bam_dmux.c
index 5dcb9a84a12e35962c9ac1be8c31d4bbb4a67c28..64dab8b57611c9ef45ca69326a2a6976efef51d1 100644 (file)
--- a/drivers/net/wwan/qcom_bam_dmux.c
+++ b/drivers/net/wwan/qcom_bam_dmux.c
@@ -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,