Commit 9086d3f2 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by David S. Miller
Browse files

net: stmmac: dwmac-socfpga: use devm_stmmac_probe_config_dt() 



Simplify the driver's probe() function by using the devres
variant of stmmac_probe_config_dt().

The calling of stmmac_pltfr_remove() now needs to be switched to
stmmac_pltfr_remove_no_dt().

Signed-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8eee20e1

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

+7 −11
Original line number Diff line number Diff line
@@ -400,21 +400,19 @@ static int socfpga_dwmac_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);



	dwmac = devm_kzalloc(dev, sizeof(*dwmac), GFP_KERNEL);

	if (!dwmac) {

		ret = -ENOMEM;

		goto err_remove_config_dt;

	}

	if (!dwmac)

		return -ENOMEM;



	dwmac->stmmac_ocp_rst = devm_reset_control_get_optional(dev, "stmmaceth-ocp");

	if (IS_ERR(dwmac->stmmac_ocp_rst)) {

		ret = PTR_ERR(dwmac->stmmac_ocp_rst);

		dev_err(dev, "error getting reset control of ocp %d\n", ret);

		goto err_remove_config_dt;

		return ret;

	}



	reset_control_deassert(dwmac->stmmac_ocp_rst);
@@ -422,7 +420,7 @@ static int socfpga_dwmac_probe(struct platform_device *pdev) 
	ret = socfpga_dwmac_parse_data(dwmac, dev);

	if (ret) {

		dev_err(dev, "Unable to parse OF data\n");

		goto err_remove_config_dt;

		return ret;

	}



	dwmac->ops = ops;
@@ -431,7 +429,7 @@ static int socfpga_dwmac_probe(struct platform_device *pdev) 


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

	if (ret)

		goto err_remove_config_dt;

		return ret;



	ndev = platform_get_drvdata(pdev);

	stpriv = netdev_priv(ndev);
@@ -492,8 +490,6 @@ static int socfpga_dwmac_probe(struct platform_device *pdev) 


err_dvr_remove:

	stmmac_dvr_remove(&pdev->dev);

err_remove_config_dt:

	stmmac_remove_config_dt(pdev, plat_dat);



	return ret;

}
@@ -504,7 +500,7 @@ static void socfpga_dwmac_remove(struct platform_device *pdev) 
	struct stmmac_priv *priv = netdev_priv(ndev);

	struct phylink_pcs *pcs = priv->hw->lynx_pcs;



	stmmac_pltfr_remove(pdev);

	stmmac_pltfr_remove_no_dt(pdev);



	lynx_pcs_destroy(pcs);

}