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

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



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

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

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

+6 −11
Original line number Diff line number Diff line
@@ -370,21 +370,18 @@ static int stm32_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(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);

	if (!dwmac) {

		ret = -ENOMEM;

		goto err_remove_config_dt;

	}

	if (!dwmac)

		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;

	}



	dwmac->ops = data;
@@ -393,14 +390,14 @@ static int stm32_dwmac_probe(struct platform_device *pdev) 
	ret = stm32_dwmac_parse_data(dwmac, &pdev->dev);

	if (ret) {

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

		goto err_remove_config_dt;

		return ret;

	}



	plat_dat->bsp_priv = dwmac;



	ret = stm32_dwmac_init(plat_dat);

	if (ret)

		goto err_remove_config_dt;

		return ret;



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

	if (ret)
@@ -410,8 +407,6 @@ static int stm32_dwmac_probe(struct platform_device *pdev) 


err_clk_disable:

	stm32_dwmac_clk_disable(dwmac);

err_remove_config_dt:

	stmmac_remove_config_dt(pdev, plat_dat);



	return ret;

}