Commit 1be0c9d6 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Jakub Kicinski
Browse files

net: stmmac: platform: provide stmmac_pltfr_remove_no_dt() 



Add a variant of stmmac_pltfr_remove() that only frees resources
allocated by stmmac_pltfr_probe() and - unlike stmmac_pltfr_remove() -
does not call stmmac_remove_config_dt().

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Link: https://lore.kernel.org/r/20230623100417.93592-8-brgl@bgdev.pl


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0a68a594

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+18 −2
Original line number Diff line number Diff line
@@ -762,6 +762,23 @@ int stmmac_pltfr_probe(struct platform_device *pdev, 
}

EXPORT_SYMBOL_GPL(stmmac_pltfr_probe);



/**

 * stmmac_pltfr_remove_no_dt

 * @pdev: pointer to the platform device

 * Description: This undoes the effects of stmmac_pltfr_probe() by removing the

 * driver and calling the platform's exit() callback.

 */

void stmmac_pltfr_remove_no_dt(struct platform_device *pdev)

{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct stmmac_priv *priv = netdev_priv(ndev);

	struct plat_stmmacenet_data *plat = priv->plat;



	stmmac_dvr_remove(&pdev->dev);

	stmmac_pltfr_exit(pdev, plat);

}

EXPORT_SYMBOL_GPL(stmmac_pltfr_remove_no_dt);



/**

 * stmmac_pltfr_remove

 * @pdev: platform device pointer
@@ -774,8 +791,7 @@ void stmmac_pltfr_remove(struct platform_device *pdev) 
	struct stmmac_priv *priv = netdev_priv(ndev);

	struct plat_stmmacenet_data *plat = priv->plat;



	stmmac_dvr_remove(&pdev->dev);

	stmmac_pltfr_exit(pdev, plat);

	stmmac_pltfr_remove_no_dt(pdev);

	stmmac_remove_config_dt(pdev, plat);

}

EXPORT_SYMBOL_GPL(stmmac_pltfr_remove);

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ void stmmac_pltfr_exit(struct platform_device *pdev, 
int stmmac_pltfr_probe(struct platform_device *pdev,

		       struct plat_stmmacenet_data *plat,

		       struct stmmac_resources *res);

void stmmac_pltfr_remove_no_dt(struct platform_device *pdev);

void stmmac_pltfr_remove(struct platform_device *pdev);

extern const struct dev_pm_ops stmmac_pltfr_pm_ops;