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

net: stmmac: dwmac-ipq806x: 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 abea8fd5

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

+9 −20
Original line number Diff line number Diff line
@@ -384,22 +384,20 @@ static int ipq806x_gmac_probe(struct platform_device *pdev) 
	if (val)

		return val;



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



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

	if (!gmac) {

		err = -ENOMEM;

		goto err_remove_config_dt;

	}

	if (!gmac)

		return -ENOMEM;



	gmac->pdev = pdev;



	err = ipq806x_gmac_of_parse(gmac);

	if (err) {

		dev_err(dev, "device tree parsing error\n");

		goto err_remove_config_dt;

		return err;

	}



	regmap_write(gmac->qsgmii_csr, QSGMII_PCS_CAL_LCKDT_CTL,
@@ -459,11 +457,11 @@ static int ipq806x_gmac_probe(struct platform_device *pdev) 
	if (gmac->phy_mode == PHY_INTERFACE_MODE_SGMII) {

		err = ipq806x_gmac_configure_qsgmii_params(gmac);

		if (err)

			goto err_remove_config_dt;

			return err;



		err = ipq806x_gmac_configure_qsgmii_pcs_speed(gmac);

		if (err)

			goto err_remove_config_dt;

			return err;

	}



	plat_dat->has_gmac = true;
@@ -473,21 +471,12 @@ static int ipq806x_gmac_probe(struct platform_device *pdev) 
	plat_dat->tx_fifo_size = 8192;

	plat_dat->rx_fifo_size = 8192;



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

	if (err)

		goto err_remove_config_dt;



	return 0;

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



err_unsupported_phy:

	dev_err(&pdev->dev, "Unsupported PHY mode: \"%s\"\n",

		phy_modes(gmac->phy_mode));

	err = -EINVAL;



err_remove_config_dt:

	stmmac_remove_config_dt(pdev, plat_dat);



	return err;

	return -EINVAL;

}



static const struct of_device_id ipq806x_gmac_dwmac_match[] = {
@@ -498,7 +487,7 @@ MODULE_DEVICE_TABLE(of, ipq806x_gmac_dwmac_match); 


static struct platform_driver ipq806x_gmac_dwmac_driver = {

	.probe = ipq806x_gmac_probe,

	.remove_new = stmmac_pltfr_remove,

	.remove_new = stmmac_pltfr_remove_no_dt,

	.driver = {

		.name		= "ipq806x-gmac-dwmac",

		.pm		= &stmmac_pltfr_pm_ops,