Commit 341d3bda authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-stmmac-convert-to-platform-remove-callback-returning-void' 

Uwe Kleine-König says:

====================
net: stmmac: Convert to platform remove callback returning void

(implicit) v1 of this series is available at
https://lore.kernel.org/netdev/20230402143025.2524443-1-u.kleine-koenig@pengutronix.de

Changes since then:

 - Added various Reviewed-by: and Acked-by: tags received for v1
 - Removed a variable in an earlier patch to make all intermediate steps
   compilable, spotted by Simon Horman
 - Rebased to v6.4-rc1 (which needed a slight adaption to cope for
   4bd3bb7b ("net: stmmac: Add glue layer for StarFive JH7110 SoC"))
====================

Link: https://lore.kernel.org/r/20230508142637.1449363-1-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 505e315b a86f8601

drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ MODULE_DEVICE_TABLE(of, anarion_dwmac_match); 


static struct platform_driver anarion_dwmac_driver = {

	.probe  = anarion_dwmac_probe,

	.remove = stmmac_pltfr_remove,

	.remove_new = stmmac_pltfr_remove,

	.driver = {

		.name           = "anarion-dwmac",

		.pm		= &stmmac_pltfr_pm_ops,

drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c

+2 −4
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev) 
	return ret;

}



static int dwc_eth_dwmac_remove(struct platform_device *pdev)

static void dwc_eth_dwmac_remove(struct platform_device *pdev)

{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct stmmac_priv *priv = netdev_priv(ndev);
@@ -477,8 +477,6 @@ static int dwc_eth_dwmac_remove(struct platform_device *pdev) 
	data->remove(pdev);



	stmmac_remove_config_dt(pdev, priv->plat);



	return 0;

}



static const struct of_device_id dwc_eth_dwmac_match[] = {
@@ -490,7 +488,7 @@ MODULE_DEVICE_TABLE(of, dwc_eth_dwmac_match); 


static struct platform_driver dwc_eth_dwmac_driver = {

	.probe  = dwc_eth_dwmac_probe,

	.remove = dwc_eth_dwmac_remove,

	.remove_new = dwc_eth_dwmac_remove,

	.driver = {

		.name           = "dwc-eth-dwmac",

		.pm             = &stmmac_pltfr_pm_ops,

drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ MODULE_DEVICE_TABLE(of, dwmac_generic_match); 


static struct platform_driver dwmac_generic_driver = {

	.probe  = dwmac_generic_probe,

	.remove = stmmac_pltfr_remove,

	.remove_new = stmmac_pltfr_remove,

	.driver = {

		.name           = STMMAC_RESOURCE_NAME,

		.pm		= &stmmac_pltfr_pm_ops,

drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ MODULE_DEVICE_TABLE(of, imx_dwmac_match); 


static struct platform_driver imx_dwmac_driver = {

	.probe  = imx_dwmac_probe,

	.remove = stmmac_pltfr_remove,

	.remove_new = stmmac_pltfr_remove,

	.driver = {

		.name           = "imx-dwmac",

		.pm		= &stmmac_pltfr_pm_ops,

drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ MODULE_DEVICE_TABLE(of, ingenic_mac_of_matches); 


static struct platform_driver ingenic_mac_driver = {

	.probe		= ingenic_mac_probe,

	.remove		= stmmac_pltfr_remove,

	.remove_new	= stmmac_pltfr_remove,

	.driver		= {

		.name	= "ingenic-mac",

		.pm		= pm_ptr(&ingenic_mac_pm_ops),