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

net: stmmac: dwmac-visconti: 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 acf73ccf

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

+5 −14
Original line number Diff line number Diff line
@@ -220,15 +220,13 @@ static int visconti_eth_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 remove_config;

	}

	if (!dwmac)

		return -ENOMEM;



	spin_lock_init(&dwmac->lock);

	dwmac->reg = stmmac_res.addr;
@@ -238,7 +236,7 @@ static int visconti_eth_dwmac_probe(struct platform_device *pdev) 


	ret = visconti_eth_clock_probe(pdev, plat_dat);

	if (ret)

		goto remove_config;

		return ret;



	visconti_eth_init_hw(pdev, plat_dat);
@@ -252,22 +250,15 @@ static int visconti_eth_dwmac_probe(struct platform_device *pdev) 


remove:

	visconti_eth_clock_remove(pdev);

remove_config:

	stmmac_remove_config_dt(pdev, plat_dat);



	return ret;

}



static void visconti_eth_dwmac_remove(struct platform_device *pdev)

{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct stmmac_priv *priv = netdev_priv(ndev);



	stmmac_pltfr_remove(pdev);

	stmmac_pltfr_remove_no_dt(pdev);



	visconti_eth_clock_remove(pdev);



	stmmac_remove_config_dt(pdev, priv->plat);

}



static const struct of_device_id visconti_eth_dwmac_match[] = {