Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b4c212b authored by Johan Hovold's avatar Johan Hovold Committed by David S. Miller
Browse files

net: stmmac: dwmac-oxnas: fix fixed-link-phydev leaks 



Make sure to deregister and free any fixed-link phy registered during
probe on probe errors and on driver unbind by calling the new glue
helper function.

For driver unbind, use the generic stmmac-platform remove implementation
and add an exit callback to disable the clock.

Fixes: 5ed74140 ("net: stmmac: Add OXNAS Glue Driver")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8f87e626

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

+26 −15
Original line number Original line Diff line number Diff line
@@ -105,6 +105,13 @@ static int oxnas_dwmac_init(struct oxnas_dwmac *dwmac) 
	return 0;

	return 0;

}

}





static void oxnas_dwmac_exit(struct platform_device *pdev, void *priv)

{

	struct oxnas_dwmac *dwmac = priv;



	clk_disable_unprepare(dwmac->clk);

}



static int oxnas_dwmac_probe(struct platform_device *pdev)

static int oxnas_dwmac_probe(struct platform_device *pdev)

{

{

	struct plat_stmmacenet_data *plat_dat;

	struct plat_stmmacenet_data *plat_dat;
@@ -121,40 +128,44 @@ static int oxnas_dwmac_probe(struct platform_device *pdev) 
		return PTR_ERR(plat_dat);

		return PTR_ERR(plat_dat);





	dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);

	dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);

	if (!dwmac)

	if (!dwmac) {

		return -ENOMEM;

		ret = -ENOMEM;

		goto err_remove_config_dt;

	}





	dwmac->dev = &pdev->dev;

	dwmac->dev = &pdev->dev;

	plat_dat->bsp_priv = dwmac;

	plat_dat->bsp_priv = dwmac;

	plat_dat->exit = oxnas_dwmac_exit;





	dwmac->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,

	dwmac->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,

							"oxsemi,sys-ctrl");

							"oxsemi,sys-ctrl");

	if (IS_ERR(dwmac->regmap)) {

	if (IS_ERR(dwmac->regmap)) {

		dev_err(&pdev->dev, "failed to have sysctrl regmap\n");

		dev_err(&pdev->dev, "failed to have sysctrl regmap\n");

		return PTR_ERR(dwmac->regmap);

		ret = PTR_ERR(dwmac->regmap);

		goto err_remove_config_dt;

	}

	}





	dwmac->clk = devm_clk_get(&pdev->dev, "gmac");

	dwmac->clk = devm_clk_get(&pdev->dev, "gmac");

	if (IS_ERR(dwmac->clk))

	if (IS_ERR(dwmac->clk)) {

		return PTR_ERR(dwmac->clk);

		ret = PTR_ERR(dwmac->clk);

		goto err_remove_config_dt;

	}





	ret = oxnas_dwmac_init(dwmac);

	ret = oxnas_dwmac_init(dwmac);

	if (ret)

	if (ret)

		return ret;

		goto err_remove_config_dt;





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

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

	if (ret)

	if (ret)

		clk_disable_unprepare(dwmac->clk);

		goto err_dwmac_exit;





	return ret;

}





static int oxnas_dwmac_remove(struct platform_device *pdev)

	return 0;

{

	struct oxnas_dwmac *dwmac = get_stmmac_bsp_priv(&pdev->dev);

	int ret = stmmac_dvr_remove(&pdev->dev);





	clk_disable_unprepare(dwmac->clk);

err_dwmac_exit:

	oxnas_dwmac_exit(pdev, plat_dat->bsp_priv);

err_remove_config_dt:

	stmmac_remove_config_dt(pdev, plat_dat);





	return ret;

	return ret;

}

}
@@ -197,7 +208,7 @@ MODULE_DEVICE_TABLE(of, oxnas_dwmac_match); 




static struct platform_driver oxnas_dwmac_driver = {

static struct platform_driver oxnas_dwmac_driver = {

	.probe  = oxnas_dwmac_probe,

	.probe  = oxnas_dwmac_probe,

	.remove = oxnas_dwmac_remove,

	.remove = stmmac_pltfr_remove,

	.driver = {

	.driver = {

		.name           = "oxnas-dwmac",

		.name           = "oxnas-dwmac",

		.pm		= &oxnas_dwmac_pm_ops,

		.pm		= &oxnas_dwmac_pm_ops,