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

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



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

The remove_new() callback 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 72ab86c2

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

+5 −16
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int lpc18xx_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);
@@ -46,8 +46,7 @@ static int lpc18xx_dwmac_probe(struct platform_device *pdev) 
	reg = syscon_regmap_lookup_by_compatible("nxp,lpc1850-creg");

	if (IS_ERR(reg)) {

		dev_err(&pdev->dev, "syscon lookup failed\n");

		ret = PTR_ERR(reg);

		goto err_remove_config_dt;

		return PTR_ERR(reg);

	}



	if (plat_dat->mac_interface == PHY_INTERFACE_MODE_MII) {
@@ -56,23 +55,13 @@ static int lpc18xx_dwmac_probe(struct platform_device *pdev) 
		ethmode = LPC18XX_CREG_CREG6_ETHMODE_RMII;

	} else {

		dev_err(&pdev->dev, "Only MII and RMII mode supported\n");

		ret = -EINVAL;

		goto err_remove_config_dt;

		return -EINVAL;

	}



	regmap_update_bits(reg, LPC18XX_CREG_CREG6,

			   LPC18XX_CREG_CREG6_ETHMODE_MASK, ethmode);



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

}



static const struct of_device_id lpc18xx_dwmac_match[] = {
@@ -83,7 +72,7 @@ MODULE_DEVICE_TABLE(of, lpc18xx_dwmac_match); 


static struct platform_driver lpc18xx_dwmac_driver = {

	.probe  = lpc18xx_dwmac_probe,

	.remove_new = stmmac_pltfr_remove,

	.remove_new = stmmac_pltfr_remove_no_dt,

	.driver = {

		.name           = "lpc18xx-dwmac",

		.pm		= &stmmac_pltfr_pm_ops,