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

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>

authored by

Uwe Kleine-König and committed by
Jakub Kicinski
a208a39e 4818016d

+19 -19
+1 -1
drivers/net/mdio/mdio-aspeed.c
··· 198 198 .of_match_table = aspeed_mdio_of_match, 199 199 }, 200 200 .probe = aspeed_mdio_probe, 201 - .remove_new = aspeed_mdio_remove, 201 + .remove = aspeed_mdio_remove, 202 202 }; 203 203 204 204 module_platform_driver(aspeed_mdio_driver);
+1 -1
drivers/net/mdio/mdio-bcm-iproc.c
··· 208 208 #endif 209 209 }, 210 210 .probe = iproc_mdio_probe, 211 - .remove_new = iproc_mdio_remove, 211 + .remove = iproc_mdio_remove, 212 212 }; 213 213 214 214 module_platform_driver(iproc_mdio_driver);
+1 -1
drivers/net/mdio/mdio-bcm-unimac.c
··· 354 354 .pm = &unimac_mdio_pm_ops, 355 355 }, 356 356 .probe = unimac_mdio_probe, 357 - .remove_new = unimac_mdio_remove, 357 + .remove = unimac_mdio_remove, 358 358 }; 359 359 module_platform_driver(unimac_mdio_driver); 360 360
+1 -1
drivers/net/mdio/mdio-gpio.c
··· 207 207 208 208 static struct platform_driver mdio_gpio_driver = { 209 209 .probe = mdio_gpio_probe, 210 - .remove_new = mdio_gpio_remove, 210 + .remove = mdio_gpio_remove, 211 211 .driver = { 212 212 .name = "mdio-gpio", 213 213 .of_match_table = mdio_gpio_of_match,
+1 -1
drivers/net/mdio/mdio-hisi-femac.c
··· 136 136 137 137 static struct platform_driver hisi_femac_mdio_driver = { 138 138 .probe = hisi_femac_mdio_probe, 139 - .remove_new = hisi_femac_mdio_remove, 139 + .remove = hisi_femac_mdio_remove, 140 140 .driver = { 141 141 .name = "hisi-femac-mdio", 142 142 .of_match_table = hisi_femac_mdio_dt_ids,
+1 -1
drivers/net/mdio/mdio-ipq4019.c
··· 391 391 392 392 static struct platform_driver ipq4019_mdio_driver = { 393 393 .probe = ipq4019_mdio_probe, 394 - .remove_new = ipq4019_mdio_remove, 394 + .remove = ipq4019_mdio_remove, 395 395 .driver = { 396 396 .name = "ipq4019-mdio", 397 397 .of_match_table = ipq4019_mdio_dt_ids,
+1 -1
drivers/net/mdio/mdio-ipq8064.c
··· 162 162 163 163 static struct platform_driver ipq8064_mdio_driver = { 164 164 .probe = ipq8064_mdio_probe, 165 - .remove_new = ipq8064_mdio_remove, 165 + .remove = ipq8064_mdio_remove, 166 166 .driver = { 167 167 .name = "ipq8064-mdio", 168 168 .of_match_table = ipq8064_mdio_dt_ids,
+1 -1
drivers/net/mdio/mdio-moxart.c
··· 171 171 172 172 static struct platform_driver moxart_mdio_driver = { 173 173 .probe = moxart_mdio_probe, 174 - .remove_new = moxart_mdio_remove, 174 + .remove = moxart_mdio_remove, 175 175 .driver = { 176 176 .name = "moxart-mdio", 177 177 .of_match_table = moxart_mdio_dt_ids,
+1 -1
drivers/net/mdio/mdio-mscc-miim.c
··· 377 377 378 378 static struct platform_driver mscc_miim_driver = { 379 379 .probe = mscc_miim_probe, 380 - .remove_new = mscc_miim_remove, 380 + .remove = mscc_miim_remove, 381 381 .driver = { 382 382 .name = "mscc-miim", 383 383 .of_match_table = mscc_miim_match,
+1 -1
drivers/net/mdio/mdio-mux-bcm-iproc.c
··· 342 342 .pm = &mdio_mux_iproc_pm_ops, 343 343 }, 344 344 .probe = mdio_mux_iproc_probe, 345 - .remove_new = mdio_mux_iproc_remove, 345 + .remove = mdio_mux_iproc_remove, 346 346 }; 347 347 348 348 module_platform_driver(mdiomux_iproc_driver);
+1 -1
drivers/net/mdio/mdio-mux-bcm6368.c
··· 173 173 .of_match_table = bcm6368_mdiomux_ids, 174 174 }, 175 175 .probe = bcm6368_mdiomux_probe, 176 - .remove_new = bcm6368_mdiomux_remove, 176 + .remove = bcm6368_mdiomux_remove, 177 177 }; 178 178 module_platform_driver(bcm6368_mdiomux_driver); 179 179
+1 -1
drivers/net/mdio/mdio-mux-gpio.c
··· 86 86 .of_match_table = mdio_mux_gpio_match, 87 87 }, 88 88 .probe = mdio_mux_gpio_probe, 89 - .remove_new = mdio_mux_gpio_remove, 89 + .remove = mdio_mux_gpio_remove, 90 90 }; 91 91 92 92 module_platform_driver(mdio_mux_gpio_driver);
+1 -1
drivers/net/mdio/mdio-mux-meson-g12a.c
··· 348 348 349 349 static struct platform_driver g12a_mdio_mux_driver = { 350 350 .probe = g12a_mdio_mux_probe, 351 - .remove_new = g12a_mdio_mux_remove, 351 + .remove = g12a_mdio_mux_remove, 352 352 .driver = { 353 353 .name = "g12a-mdio_mux", 354 354 .of_match_table = g12a_mdio_mux_match,
+1 -1
drivers/net/mdio/mdio-mux-meson-gxl.c
··· 149 149 150 150 static struct platform_driver gxl_mdio_mux_driver = { 151 151 .probe = gxl_mdio_mux_probe, 152 - .remove_new = gxl_mdio_mux_remove, 152 + .remove = gxl_mdio_mux_remove, 153 153 .driver = { 154 154 .name = "gxl-mdio-mux", 155 155 .of_match_table = gxl_mdio_mux_match,
+1 -1
drivers/net/mdio/mdio-mux-mmioreg.c
··· 180 180 .of_match_table = mdio_mux_mmioreg_match, 181 181 }, 182 182 .probe = mdio_mux_mmioreg_probe, 183 - .remove_new = mdio_mux_mmioreg_remove, 183 + .remove = mdio_mux_mmioreg_remove, 184 184 }; 185 185 186 186 module_platform_driver(mdio_mux_mmioreg_driver);
+1 -1
drivers/net/mdio/mdio-mux-multiplexer.c
··· 107 107 .of_match_table = mdio_mux_multiplexer_match, 108 108 }, 109 109 .probe = mdio_mux_multiplexer_probe, 110 - .remove_new = mdio_mux_multiplexer_remove, 110 + .remove = mdio_mux_multiplexer_remove, 111 111 }; 112 112 113 113 module_platform_driver(mdio_mux_multiplexer_driver);
+1 -1
drivers/net/mdio/mdio-octeon.c
··· 104 104 .of_match_table = octeon_mdiobus_match, 105 105 }, 106 106 .probe = octeon_mdiobus_probe, 107 - .remove_new = octeon_mdiobus_remove, 107 + .remove = octeon_mdiobus_remove, 108 108 }; 109 109 110 110 module_platform_driver(octeon_mdiobus_driver);
+1 -1
drivers/net/mdio/mdio-sun4i.c
··· 164 164 165 165 static struct platform_driver sun4i_mdio_driver = { 166 166 .probe = sun4i_mdio_probe, 167 - .remove_new = sun4i_mdio_remove, 167 + .remove = sun4i_mdio_remove, 168 168 .driver = { 169 169 .name = "sun4i-mdio", 170 170 .of_match_table = sun4i_mdio_dt_ids,
+1 -1
drivers/net/mdio/mdio-xgene.c
··· 441 441 .acpi_match_table = ACPI_PTR(xgene_mdio_acpi_match), 442 442 }, 443 443 .probe = xgene_mdio_probe, 444 - .remove_new = xgene_mdio_remove, 444 + .remove = xgene_mdio_remove, 445 445 }; 446 446 447 447 module_platform_driver(xgene_mdio_driver);