net: mdio: 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/mdio 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>
Link: https://patch.msgid.link/0b60d8bfc45a3de8193f953794dda241e11032a9.1727949050.git.u.kleine-koenig@baylibre.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/mdio/mdio-aspeed.c b/drivers/net/mdio/mdio-aspeed.c
index c2170650415cdbd9d6076fe12e0014c33e40be15..e55be6dc9ae70f9e76c4a76df427193e74a5e039 100644 (file)
--- a/drivers/net/mdio/mdio-aspeed.c
+++ b/drivers/net/mdio/mdio-aspeed.c
@@ -198,7 +198,7 @@ static struct platform_driver aspeed_mdio_driver = {
                .of_match_table = aspeed_mdio_of_match,
        },
        .probe = aspeed_mdio_probe,
-       .remove_new = aspeed_mdio_remove,
+       .remove = aspeed_mdio_remove,
 };
 
 module_platform_driver(aspeed_mdio_driver);

diff --git a/drivers/net/mdio/mdio-bcm-iproc.c b/drivers/net/mdio/mdio-bcm-iproc.c
index 5a2d26c6afdc278b4b4c6d5b0daa978b32e6b493..91690b496793c0af97cf9c56c91b249be66cacbe 100644 (file)
--- a/drivers/net/mdio/mdio-bcm-iproc.c
+++ b/drivers/net/mdio/mdio-bcm-iproc.c
@@ -208,7 +208,7 @@ static struct platform_driver iproc_mdio_driver = {
 #endif
        },
        .probe = iproc_mdio_probe,
-       .remove_new = iproc_mdio_remove,
+       .remove = iproc_mdio_remove,
 };
 
 module_platform_driver(iproc_mdio_driver);

diff --git a/drivers/net/mdio/mdio-bcm-unimac.c b/drivers/net/mdio/mdio-bcm-unimac.c
index f40eb50bb978d8eed8b3755392c34ffec02f243f..f93e41f5fefbbfad355a97bafbf3dd882d97a3e7 100644 (file)
--- a/drivers/net/mdio/mdio-bcm-unimac.c
+++ b/drivers/net/mdio/mdio-bcm-unimac.c
@@ -354,7 +354,7 @@ static struct platform_driver unimac_mdio_driver = {
                .pm = &unimac_mdio_pm_ops,
        },
        .probe  = unimac_mdio_probe,
-       .remove_new = unimac_mdio_remove,
+       .remove = unimac_mdio_remove,
 };
 module_platform_driver(unimac_mdio_driver);
 

diff --git a/drivers/net/mdio/mdio-gpio.c b/drivers/net/mdio/mdio-gpio.c
index 82088741debd9cdcec2ed2a44de874643310ef7d..1cfd538b5105d9b0621572c22bc93dddef85d6f5 100644 (file)
--- a/drivers/net/mdio/mdio-gpio.c
+++ b/drivers/net/mdio/mdio-gpio.c
@@ -207,7 +207,7 @@ MODULE_DEVICE_TABLE(of, mdio_gpio_of_match);
 
 static struct platform_driver mdio_gpio_driver = {
        .probe = mdio_gpio_probe,
-       .remove_new = mdio_gpio_remove,
+       .remove = mdio_gpio_remove,
        .driver         = {
                .name   = "mdio-gpio",
                .of_match_table = mdio_gpio_of_match,

diff --git a/drivers/net/mdio/mdio-hisi-femac.c b/drivers/net/mdio/mdio-hisi-femac.c
index 6703f626ee833b9e25a7176d3dcb046dba8369b7..d78a1dc36cfd5802588187211e073fa9a5dd6c67 100644 (file)
--- a/drivers/net/mdio/mdio-hisi-femac.c
+++ b/drivers/net/mdio/mdio-hisi-femac.c
@@ -136,7 +136,7 @@ MODULE_DEVICE_TABLE(of, hisi_femac_mdio_dt_ids);
 
 static struct platform_driver hisi_femac_mdio_driver = {
        .probe = hisi_femac_mdio_probe,
-       .remove_new = hisi_femac_mdio_remove,
+       .remove = hisi_femac_mdio_remove,
        .driver = {
                .name = "hisi-femac-mdio",
                .of_match_table = hisi_femac_mdio_dt_ids,

diff --git a/drivers/net/mdio/mdio-ipq4019.c b/drivers/net/mdio/mdio-ipq4019.c
index 9d8f43b28aac5b975bf5e06bac5827c29335ceae..dd3ed2d6430b1e9fb2a1e4e1666deeb28b7578e1 100644 (file)
--- a/drivers/net/mdio/mdio-ipq4019.c
+++ b/drivers/net/mdio/mdio-ipq4019.c
@@ -391,7 +391,7 @@ MODULE_DEVICE_TABLE(of, ipq4019_mdio_dt_ids);
 
 static struct platform_driver ipq4019_mdio_driver = {
        .probe = ipq4019_mdio_probe,
-       .remove_new = ipq4019_mdio_remove,
+       .remove = ipq4019_mdio_remove,
        .driver = {
                .name = "ipq4019-mdio",
                .of_match_table = ipq4019_mdio_dt_ids,

diff --git a/drivers/net/mdio/mdio-ipq8064.c b/drivers/net/mdio/mdio-ipq8064.c
index f71b6e1c66e42826907c07f4c2a86c44cf740a57..6253a9ab8b699fe8fe504170a880e55aff7c3ae9 100644 (file)
--- a/drivers/net/mdio/mdio-ipq8064.c
+++ b/drivers/net/mdio/mdio-ipq8064.c
@@ -162,7 +162,7 @@ MODULE_DEVICE_TABLE(of, ipq8064_mdio_dt_ids);
 
 static struct platform_driver ipq8064_mdio_driver = {
        .probe = ipq8064_mdio_probe,
-       .remove_new = ipq8064_mdio_remove,
+       .remove = ipq8064_mdio_remove,
        .driver = {
                .name = "ipq8064-mdio",
                .of_match_table = ipq8064_mdio_dt_ids,

diff --git a/drivers/net/mdio/mdio-moxart.c b/drivers/net/mdio/mdio-moxart.c
index d35af8cd7c4d4663b5e9fedc55f2596b3fa01e5c..9853be6f0f22b47a263d794b04a7a1846a4bc81a 100644 (file)
--- a/drivers/net/mdio/mdio-moxart.c
+++ b/drivers/net/mdio/mdio-moxart.c
@@ -171,7 +171,7 @@ MODULE_DEVICE_TABLE(of, moxart_mdio_dt_ids);
 
 static struct platform_driver moxart_mdio_driver = {
        .probe = moxart_mdio_probe,
-       .remove_new = moxart_mdio_remove,
+       .remove = moxart_mdio_remove,
        .driver = {
                .name = "moxart-mdio",
                .of_match_table = moxart_mdio_dt_ids,

diff --git a/drivers/net/mdio/mdio-mscc-miim.c b/drivers/net/mdio/mdio-mscc-miim.c
index 62c47e0dd14240891c88c405ac712e8463155ca8..944efd33da6dc29eb127dc78d3e7f69f3ece1d5a 100644 (file)
--- a/drivers/net/mdio/mdio-mscc-miim.c
+++ b/drivers/net/mdio/mdio-mscc-miim.c
@@ -377,7 +377,7 @@ MODULE_DEVICE_TABLE(of, mscc_miim_match);
 
 static struct platform_driver mscc_miim_driver = {
        .probe = mscc_miim_probe,
-       .remove_new = mscc_miim_remove,
+       .remove = mscc_miim_remove,
        .driver = {
                .name = "mscc-miim",
                .of_match_table = mscc_miim_match,

diff --git a/drivers/net/mdio/mdio-mux-bcm-iproc.c b/drivers/net/mdio/mdio-mux-bcm-iproc.c
index 1ce7d67ba72ef2c4654f2811c6bf700621910cb2..8ba0917a930a00fc36b2ddf0ff9824a4dd956cbf 100644 (file)
--- a/drivers/net/mdio/mdio-mux-bcm-iproc.c
+++ b/drivers/net/mdio/mdio-mux-bcm-iproc.c
@@ -342,7 +342,7 @@ static struct platform_driver mdiomux_iproc_driver = {
                .pm             = &mdio_mux_iproc_pm_ops,
        },
        .probe          = mdio_mux_iproc_probe,
-       .remove_new     = mdio_mux_iproc_remove,
+       .remove         = mdio_mux_iproc_remove,
 };
 
 module_platform_driver(mdiomux_iproc_driver);

diff --git a/drivers/net/mdio/mdio-mux-bcm6368.c b/drivers/net/mdio/mdio-mux-bcm6368.c
index 1b77e0e3e6e1f93297d6aa9f18179bb9fc6dfee1..476f8b72d020515049a41ac7b680d27f41fdeb52 100644 (file)
--- a/drivers/net/mdio/mdio-mux-bcm6368.c
+++ b/drivers/net/mdio/mdio-mux-bcm6368.c
@@ -173,7 +173,7 @@ static struct platform_driver bcm6368_mdiomux_driver = {
                .of_match_table = bcm6368_mdiomux_ids,
        },
        .probe  = bcm6368_mdiomux_probe,
-       .remove_new = bcm6368_mdiomux_remove,
+       .remove = bcm6368_mdiomux_remove,
 };
 module_platform_driver(bcm6368_mdiomux_driver);
 

diff --git a/drivers/net/mdio/mdio-mux-gpio.c b/drivers/net/mdio/mdio-mux-gpio.c
index 38fb031f897931ba30318deb8f3fcb5e9d94aa9d..ef77bd1abae984e5b1e51315de39cae33e0d063d 100644 (file)
--- a/drivers/net/mdio/mdio-mux-gpio.c
+++ b/drivers/net/mdio/mdio-mux-gpio.c
@@ -86,7 +86,7 @@ static struct platform_driver mdio_mux_gpio_driver = {
                .of_match_table = mdio_mux_gpio_match,
        },
        .probe          = mdio_mux_gpio_probe,
-       .remove_new     = mdio_mux_gpio_remove,
+       .remove         = mdio_mux_gpio_remove,
 };
 
 module_platform_driver(mdio_mux_gpio_driver);

diff --git a/drivers/net/mdio/mdio-mux-meson-g12a.c b/drivers/net/mdio/mdio-mux-meson-g12a.c
index 754b0f2cf15b9592a6c0c199f9f801f2d4910476..08d6a6c93fb8bf027ef8b7ddc321739e98012c91 100644 (file)
--- a/drivers/net/mdio/mdio-mux-meson-g12a.c
+++ b/drivers/net/mdio/mdio-mux-meson-g12a.c
@@ -348,7 +348,7 @@ static void g12a_mdio_mux_remove(struct platform_device *pdev)
 
 static struct platform_driver g12a_mdio_mux_driver = {
        .probe          = g12a_mdio_mux_probe,
-       .remove_new     = g12a_mdio_mux_remove,
+       .remove         = g12a_mdio_mux_remove,
        .driver         = {
                .name   = "g12a-mdio_mux",
                .of_match_table = g12a_mdio_mux_match,

diff --git a/drivers/net/mdio/mdio-mux-meson-gxl.c b/drivers/net/mdio/mdio-mux-meson-gxl.c
index 89554021b5ccc40a0dd494221e90d3ce8f755d2a..00c66240136b108fc330fff3585c2bd822bcf483 100644 (file)
--- a/drivers/net/mdio/mdio-mux-meson-gxl.c
+++ b/drivers/net/mdio/mdio-mux-meson-gxl.c
@@ -149,7 +149,7 @@ static void gxl_mdio_mux_remove(struct platform_device *pdev)
 
 static struct platform_driver gxl_mdio_mux_driver = {
        .probe          = gxl_mdio_mux_probe,
-       .remove_new     = gxl_mdio_mux_remove,
+       .remove         = gxl_mdio_mux_remove,
        .driver         = {
                .name   = "gxl-mdio-mux",
                .of_match_table = gxl_mdio_mux_match,

diff --git a/drivers/net/mdio/mdio-mux-mmioreg.c b/drivers/net/mdio/mdio-mux-mmioreg.c
index b70e6d1ad429443ced2c617dd141bcb5071f54f1..9c4b1efd0d53c9af603cdef23fdfa43e9f6dff74 100644 (file)
--- a/drivers/net/mdio/mdio-mux-mmioreg.c
+++ b/drivers/net/mdio/mdio-mux-mmioreg.c
@@ -180,7 +180,7 @@ static struct platform_driver mdio_mux_mmioreg_driver = {
                .of_match_table = mdio_mux_mmioreg_match,
        },
        .probe          = mdio_mux_mmioreg_probe,
-       .remove_new     = mdio_mux_mmioreg_remove,
+       .remove         = mdio_mux_mmioreg_remove,
 };
 
 module_platform_driver(mdio_mux_mmioreg_driver);

diff --git a/drivers/net/mdio/mdio-mux-multiplexer.c b/drivers/net/mdio/mdio-mux-multiplexer.c
index 569b1338319184e306a0b268977562f1174c5464..8e11960fc539d14b2b9e0e4535e290bf7a42e9a1 100644 (file)
--- a/drivers/net/mdio/mdio-mux-multiplexer.c
+++ b/drivers/net/mdio/mdio-mux-multiplexer.c
@@ -107,7 +107,7 @@ static struct platform_driver mdio_mux_multiplexer_driver = {
                .of_match_table = mdio_mux_multiplexer_match,
        },
        .probe          = mdio_mux_multiplexer_probe,
-       .remove_new     = mdio_mux_multiplexer_remove,
+       .remove         = mdio_mux_multiplexer_remove,
 };
 
 module_platform_driver(mdio_mux_multiplexer_driver);

diff --git a/drivers/net/mdio/mdio-octeon.c b/drivers/net/mdio/mdio-octeon.c
index 037a38cfed56a6b32d16f00c76dd474e03e86858..2beb83154d39c76657ac9201115b5b587b4a8d82 100644 (file)
--- a/drivers/net/mdio/mdio-octeon.c
+++ b/drivers/net/mdio/mdio-octeon.c
@@ -104,7 +104,7 @@ static struct platform_driver octeon_mdiobus_driver = {
                .of_match_table = octeon_mdiobus_match,
        },
        .probe          = octeon_mdiobus_probe,
-       .remove_new     = octeon_mdiobus_remove,
+       .remove         = octeon_mdiobus_remove,
 };
 
 module_platform_driver(octeon_mdiobus_driver);

diff --git a/drivers/net/mdio/mdio-sun4i.c b/drivers/net/mdio/mdio-sun4i.c
index 4511bcc73b3671a015ce97d1cda64809fe56ad24..ad1edadc5a082e7e6f4007a5141d97da401503d9 100644 (file)
--- a/drivers/net/mdio/mdio-sun4i.c
+++ b/drivers/net/mdio/mdio-sun4i.c
@@ -164,7 +164,7 @@ MODULE_DEVICE_TABLE(of, sun4i_mdio_dt_ids);
 
 static struct platform_driver sun4i_mdio_driver = {
        .probe = sun4i_mdio_probe,
-       .remove_new = sun4i_mdio_remove,
+       .remove = sun4i_mdio_remove,
        .driver = {
                .name = "sun4i-mdio",
                .of_match_table = sun4i_mdio_dt_ids,

diff --git a/drivers/net/mdio/mdio-xgene.c b/drivers/net/mdio/mdio-xgene.c
index 2772a309854369f6838d4e6fa00edd6dca4000e3..a8f91a4b7fed0927ee14e408000cd3a2bfb9b09a 100644 (file)
--- a/drivers/net/mdio/mdio-xgene.c
+++ b/drivers/net/mdio/mdio-xgene.c
@@ -441,7 +441,7 @@ static struct platform_driver xgene_mdio_driver = {
                .acpi_match_table = ACPI_PTR(xgene_mdio_acpi_match),
        },
        .probe = xgene_mdio_probe,
-       .remove_new = xgene_mdio_remove,
+       .remove = xgene_mdio_remove,
 };
 
 module_platform_driver(xgene_mdio_driver);