mirror of
https://github.com/Dasharo/linux.git
synced 2026-03-06 15:25:10 -08:00
net: ethernet: 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/ethernet 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>
Link: https://patch.msgid.link/18f7c585a1a8a8ac8b03a2fca7de19bd5c52ac2b.1727949050.git.u.kleine-koenig@baylibre.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
41378cfdc4
commit
e96321fad3
@@ -1009,7 +1009,7 @@ static struct platform_driver axdrv = {
|
||||
.name = "ax88796",
|
||||
},
|
||||
.probe = ax_probe,
|
||||
.remove_new = ax_remove,
|
||||
.remove = ax_remove,
|
||||
.suspend = ax_suspend,
|
||||
.resume = ax_resume,
|
||||
};
|
||||
|
||||
@@ -457,7 +457,7 @@ static struct platform_driver mcf8390_drv = {
|
||||
.name = "mcf8390",
|
||||
},
|
||||
.probe = mcf8390_probe,
|
||||
.remove_new = mcf8390_remove,
|
||||
.remove = mcf8390_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(mcf8390_drv);
|
||||
|
||||
@@ -894,7 +894,7 @@ static int ne_drv_resume(struct platform_device *pdev)
|
||||
#endif
|
||||
|
||||
static struct platform_driver ne_driver = {
|
||||
.remove_new = ne_drv_remove,
|
||||
.remove = ne_drv_remove,
|
||||
.suspend = ne_drv_suspend,
|
||||
.resume = ne_drv_resume,
|
||||
.driver = {
|
||||
|
||||
@@ -1607,7 +1607,7 @@ static struct platform_driver owl_emac_driver = {
|
||||
.pm = &owl_emac_pm_ops,
|
||||
},
|
||||
.probe = owl_emac_probe,
|
||||
.remove_new = owl_emac_remove,
|
||||
.remove = owl_emac_remove,
|
||||
};
|
||||
module_platform_driver(owl_emac_driver);
|
||||
|
||||
|
||||
@@ -1564,7 +1564,7 @@ static struct platform_driver greth_of_driver = {
|
||||
.of_match_table = greth_of_match,
|
||||
},
|
||||
.probe = greth_of_probe,
|
||||
.remove_new = greth_of_remove,
|
||||
.remove = greth_of_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(greth_of_driver);
|
||||
|
||||
@@ -1142,7 +1142,7 @@ static struct platform_driver emac_driver = {
|
||||
.of_match_table = emac_of_match,
|
||||
},
|
||||
.probe = emac_probe,
|
||||
.remove_new = emac_remove,
|
||||
.remove = emac_remove,
|
||||
.suspend = emac_suspend,
|
||||
.resume = emac_resume,
|
||||
};
|
||||
|
||||
@@ -1519,7 +1519,7 @@ MODULE_DEVICE_TABLE(of, altera_tse_ids);
|
||||
|
||||
static struct platform_driver altera_tse_driver = {
|
||||
.probe = altera_tse_probe,
|
||||
.remove_new = altera_tse_remove,
|
||||
.remove = altera_tse_remove,
|
||||
.suspend = NULL,
|
||||
.resume = NULL,
|
||||
.driver = {
|
||||
|
||||
@@ -1363,7 +1363,7 @@ static void au1000_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver au1000_eth_driver = {
|
||||
.probe = au1000_probe,
|
||||
.remove_new = au1000_remove,
|
||||
.remove = au1000_remove,
|
||||
.driver = {
|
||||
.name = "au1000-eth",
|
||||
},
|
||||
|
||||
@@ -1514,7 +1514,7 @@ static struct platform_driver sunlance_sbus_driver = {
|
||||
.of_match_table = sunlance_sbus_match,
|
||||
},
|
||||
.probe = sunlance_sbus_probe,
|
||||
.remove_new = sunlance_sbus_remove,
|
||||
.remove = sunlance_sbus_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(sunlance_sbus_driver);
|
||||
|
||||
@@ -565,7 +565,7 @@ static struct platform_driver xgbe_driver = {
|
||||
.pm = &xgbe_platform_pm_ops,
|
||||
},
|
||||
.probe = xgbe_platform_probe,
|
||||
.remove_new = xgbe_platform_remove,
|
||||
.remove = xgbe_platform_remove,
|
||||
};
|
||||
|
||||
int xgbe_platform_init(void)
|
||||
|
||||
@@ -734,7 +734,7 @@ static struct platform_driver xge_driver = {
|
||||
.acpi_match_table = ACPI_PTR(xge_acpi_match),
|
||||
},
|
||||
.probe = xge_probe,
|
||||
.remove_new = xge_remove,
|
||||
.remove = xge_remove,
|
||||
.shutdown = xge_shutdown,
|
||||
};
|
||||
module_platform_driver(xge_driver);
|
||||
|
||||
@@ -2159,7 +2159,7 @@ static struct platform_driver xgene_enet_driver = {
|
||||
.acpi_match_table = ACPI_PTR(xgene_enet_acpi_match),
|
||||
},
|
||||
.probe = xgene_enet_probe,
|
||||
.remove_new = xgene_enet_remove,
|
||||
.remove = xgene_enet_remove,
|
||||
.shutdown = xgene_enet_shutdown,
|
||||
};
|
||||
|
||||
|
||||
@@ -759,7 +759,7 @@ static void mac_mace_device_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver mac_mace_driver = {
|
||||
.probe = mace_probe,
|
||||
.remove_new = mac_mace_device_remove,
|
||||
.remove = mac_mace_device_remove,
|
||||
.driver = {
|
||||
.name = mac_mace_string,
|
||||
},
|
||||
|
||||
@@ -264,7 +264,7 @@ static void emac_rockchip_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver emac_rockchip_driver = {
|
||||
.probe = emac_rockchip_probe,
|
||||
.remove_new = emac_rockchip_remove,
|
||||
.remove = emac_rockchip_remove,
|
||||
.driver = {
|
||||
.name = DRV_NAME,
|
||||
.of_match_table = emac_rockchip_dt_ids,
|
||||
|
||||
@@ -1500,7 +1500,7 @@ static SIMPLE_DEV_PM_OPS(bcmasp_pm_ops,
|
||||
|
||||
static struct platform_driver bcmasp_driver = {
|
||||
.probe = bcmasp_probe,
|
||||
.remove_new = bcmasp_remove,
|
||||
.remove = bcmasp_remove,
|
||||
.shutdown = bcmasp_shutdown,
|
||||
.driver = {
|
||||
.name = "brcm,asp-v2",
|
||||
|
||||
@@ -789,7 +789,7 @@ static struct platform_driver bcm4908_enet_driver = {
|
||||
.of_match_table = bcm4908_enet_of_match,
|
||||
},
|
||||
.probe = bcm4908_enet_probe,
|
||||
.remove_new = bcm4908_enet_remove,
|
||||
.remove = bcm4908_enet_remove,
|
||||
};
|
||||
module_platform_driver(bcm4908_enet_driver);
|
||||
|
||||
|
||||
@@ -1936,7 +1936,7 @@ static void bcm_enet_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver bcm63xx_enet_driver = {
|
||||
.probe = bcm_enet_probe,
|
||||
.remove_new = bcm_enet_remove,
|
||||
.remove = bcm_enet_remove,
|
||||
.driver = {
|
||||
.name = "bcm63xx_enet",
|
||||
},
|
||||
@@ -2755,7 +2755,7 @@ static void bcm_enetsw_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver bcm63xx_enetsw_driver = {
|
||||
.probe = bcm_enetsw_probe,
|
||||
.remove_new = bcm_enetsw_remove,
|
||||
.remove = bcm_enetsw_remove,
|
||||
.driver = {
|
||||
.name = "bcm63xx_enetsw",
|
||||
},
|
||||
|
||||
@@ -2899,7 +2899,7 @@ static SIMPLE_DEV_PM_OPS(bcm_sysport_pm_ops,
|
||||
|
||||
static struct platform_driver bcm_sysport_driver = {
|
||||
.probe = bcm_sysport_probe,
|
||||
.remove_new = bcm_sysport_remove,
|
||||
.remove = bcm_sysport_remove,
|
||||
.driver = {
|
||||
.name = "brcm-systemport",
|
||||
.of_match_table = bcm_sysport_of_match,
|
||||
|
||||
@@ -294,7 +294,7 @@ static struct platform_driver bgmac_enet_driver = {
|
||||
.pm = BGMAC_PM_OPS
|
||||
},
|
||||
.probe = bgmac_probe,
|
||||
.remove_new = bgmac_remove,
|
||||
.remove = bgmac_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(bgmac_enet_driver);
|
||||
|
||||
@@ -4350,7 +4350,7 @@ MODULE_DEVICE_TABLE(acpi, genet_acpi_match);
|
||||
|
||||
static struct platform_driver bcmgenet_driver = {
|
||||
.probe = bcmgenet_probe,
|
||||
.remove_new = bcmgenet_remove,
|
||||
.remove = bcmgenet_remove,
|
||||
.shutdown = bcmgenet_shutdown,
|
||||
.driver = {
|
||||
.name = "bcmgenet",
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user