Commit a5ea2653 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'stmmac-devvm_stmmac_probe_config_dt-conversion' 

Jisheng Zhang says:

====================
stmmac: convert to devm_stmmac_probe_config_dt

Russell pointed out there's a new devm_stmmac_probe_config_dt()
helper now when reviewing my starfive gmac error handling patch[1].
After greping the code, this nice helper was introduced by Bartosz in
[2], I think it's time to convert all dwmac users to this helper and
finally complete the TODO in [2] "but once all users of the old
stmmac_pltfr_remove() are converted to the devres helper, it will be
renamed back to stmmac_pltfr_remove() and the no_dt function removed."

Link: https://lore.kernel.org/netdev/ZOtWmedBsa6wQQ6+@shell.armlinux.org.uk/ [1]
Link: https://lore.kernel.org/all/20230623100417.93592-1-brgl@bgdev.pl/

  [2]

Since v1:
 - rebase on new net-next
 - add make stmmac_{probe|remove}_config_dt static as suggested by Russell.
====================

Reviewed-by: default avatarEmil Renner Berthing <emil.renner.berthing@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e8535bfb b2504f64

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

+2 −8
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int anarion_dwmac_probe(struct platform_device *pdev) 
	if (IS_ERR(gmac))

		return PTR_ERR(gmac);



	plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);

	plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac);

	if (IS_ERR(plat_dat))

		return PTR_ERR(plat_dat);
@@ -124,13 +124,7 @@ static int anarion_dwmac_probe(struct platform_device *pdev) 
	anarion_gmac_init(pdev, gmac);

	plat_dat->bsp_priv = gmac;



	ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);

	if (ret) {

		stmmac_remove_config_dt(pdev, plat_dat);

		return ret;

	}



	return 0;

	return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);

}



static const struct of_device_id anarion_dwmac_match[] = {

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

+3 −12
Original line number Diff line number Diff line
@@ -435,15 +435,14 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev) 
	if (IS_ERR(stmmac_res.addr))

		return PTR_ERR(stmmac_res.addr);



	plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);

	plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac);

	if (IS_ERR(plat_dat))

		return PTR_ERR(plat_dat);



	ret = data->probe(pdev, plat_dat, &stmmac_res);

	if (ret < 0) {

		dev_err_probe(&pdev->dev, ret, "failed to probe subdriver\n");



		goto remove_config;

		return ret;

	}



	ret = dwc_eth_dwmac_config_dt(pdev, plat_dat);
@@ -458,25 +457,17 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev) 


remove:

	data->remove(pdev);

remove_config:

	stmmac_remove_config_dt(pdev, plat_dat);



	return ret;

}



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);

	const struct dwc_eth_dwmac_data *data;



	data = device_get_match_data(&pdev->dev);

	const struct dwc_eth_dwmac_data *data = device_get_match_data(&pdev->dev);



	stmmac_dvr_remove(&pdev->dev);



	data->remove(pdev);



	stmmac_remove_config_dt(pdev, priv->plat);

}



static const struct of_device_id dwc_eth_dwmac_match[] = {

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

+2 −13
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static int dwmac_generic_probe(struct platform_device *pdev) 
		return ret;



	if (pdev->dev.of_node) {

		plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);

		plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac);

		if (IS_ERR(plat_dat)) {

			dev_err(&pdev->dev, "dt configuration failed\n");

			return PTR_ERR(plat_dat);
@@ -46,17 +46,7 @@ static int dwmac_generic_probe(struct platform_device *pdev) 
		plat_dat->unicast_filter_entries = 1;

	}



	ret = stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);

	if (ret)

		goto err_remove_config_dt;



	return 0;



err_remove_config_dt:

	if (pdev->dev.of_node)

		stmmac_remove_config_dt(pdev, plat_dat);



	return ret;

	return devm_stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);

}



static const struct of_device_id dwmac_generic_match[] = {
@@ -77,7 +67,6 @@ MODULE_DEVICE_TABLE(of, dwmac_generic_match); 


static struct platform_driver dwmac_generic_driver = {

	.probe  = dwmac_generic_probe,

	.remove_new = stmmac_pltfr_remove,

	.driver = {

		.name           = STMMAC_RESOURCE_NAME,

		.pm		= &stmmac_pltfr_pm_ops,

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

+4 −9
Original line number Diff line number Diff line
@@ -331,15 +331,14 @@ static int imx_dwmac_probe(struct platform_device *pdev) 
	if (!dwmac)

		return -ENOMEM;



	plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);

	plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac);

	if (IS_ERR(plat_dat))

		return PTR_ERR(plat_dat);



	data = of_device_get_match_data(&pdev->dev);

	if (!data) {

		dev_err(&pdev->dev, "failed to get match data\n");

		ret = -EINVAL;

		goto err_match_data;

		return -EINVAL;

	}



	dwmac->ops = data;
@@ -348,7 +347,7 @@ static int imx_dwmac_probe(struct platform_device *pdev) 
	ret = imx_dwmac_parse_dt(dwmac, &pdev->dev);

	if (ret) {

		dev_err(&pdev->dev, "failed to parse OF data\n");

		goto err_parse_dt;

		return ret;

	}



	if (data->flags & STMMAC_FLAG_HWTSTAMP_CORRECT_LATENCY)
@@ -365,7 +364,7 @@ static int imx_dwmac_probe(struct platform_device *pdev) 


	ret = imx_dwmac_clks_config(dwmac, true);

	if (ret)

		goto err_clks_config;

		return ret;



	ret = imx_dwmac_init(pdev, dwmac);

	if (ret)
@@ -385,10 +384,6 @@ static int imx_dwmac_probe(struct platform_device *pdev) 
	imx_dwmac_exit(pdev, plat_dat->bsp_priv);

err_dwmac_init:

	imx_dwmac_clks_config(dwmac, false);

err_clks_config:

err_parse_dt:

err_match_data:

	stmmac_remove_config_dt(pdev, plat_dat);

	return ret;

}

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

+9 −24
Original line number Diff line number Diff line
@@ -241,29 +241,25 @@ static int ingenic_mac_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);

	plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac);

	if (IS_ERR(plat_dat))

		return PTR_ERR(plat_dat);



	mac = devm_kzalloc(&pdev->dev, sizeof(*mac), GFP_KERNEL);

	if (!mac) {

		ret = -ENOMEM;

		goto err_remove_config_dt;

	}

	if (!mac)

		return -ENOMEM;



	data = of_device_get_match_data(&pdev->dev);

	if (!data) {

		dev_err(&pdev->dev, "No of match data provided\n");

		ret = -EINVAL;

		goto err_remove_config_dt;

		return -EINVAL;

	}



	/* Get MAC PHY control register */

	mac->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, "mode-reg");

	if (IS_ERR(mac->regmap)) {

		dev_err(&pdev->dev, "%s: Failed to get syscon regmap\n", __func__);

		ret = PTR_ERR(mac->regmap);

		goto err_remove_config_dt;

		return PTR_ERR(mac->regmap);

	}



	if (!of_property_read_u32(pdev->dev.of_node, "tx-clk-delay-ps", &tx_delay_ps)) {
@@ -272,8 +268,7 @@ static int ingenic_mac_probe(struct platform_device *pdev) 
			mac->tx_delay = tx_delay_ps * 1000;

		} else {

			dev_err(&pdev->dev, "Invalid TX clock delay: %dps\n", tx_delay_ps);

			ret = -EINVAL;

			goto err_remove_config_dt;

			return -EINVAL;

		}

	}
@@ -283,8 +278,7 @@ static int ingenic_mac_probe(struct platform_device *pdev) 
			mac->rx_delay = rx_delay_ps * 1000;

		} else {

			dev_err(&pdev->dev, "Invalid RX clock delay: %dps\n", rx_delay_ps);

			ret = -EINVAL;

			goto err_remove_config_dt;

			return -EINVAL;

		}

	}
@@ -295,18 +289,9 @@ static int ingenic_mac_probe(struct platform_device *pdev) 


	ret = ingenic_mac_init(plat_dat);

	if (ret)

		goto err_remove_config_dt;



	ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);

	if (ret)

		goto err_remove_config_dt;



	return 0;



err_remove_config_dt:

	stmmac_remove_config_dt(pdev, plat_dat);



		return ret;



	return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);

}



#ifdef CONFIG_PM_SLEEP