Skip to content

Commit

Permalink
net: stmmac: platform: provide devm_stmmac_pltfr_probe()
Browse files Browse the repository at this point in the history
Provide a devres variant of stmmac_pltfr_probe() which allows users to
skip calling stmmac_pltfr_remove() at driver detach.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Link: https://lore.kernel.org/r/20230623100417.93592-11-brgl@bgdev.pl
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Bartosz Golaszewski authored and Jakub Kicinski committed Jun 24, 2023
1 parent 061425d commit fc9ee2a
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
30 changes: 30 additions & 0 deletions drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,36 @@ int stmmac_pltfr_probe(struct platform_device *pdev,
}
EXPORT_SYMBOL_GPL(stmmac_pltfr_probe);

static void devm_stmmac_pltfr_remove(void *data)
{
struct platform_device *pdev = data;

stmmac_pltfr_remove_no_dt(pdev);
}

/**
* devm_stmmac_pltfr_probe
* @pdev: pointer to the platform device
* @plat: driver data platform structure
* @res: stmmac resources
* Description: Devres variant of stmmac_pltfr_probe(). Allows users to skip
* calling stmmac_pltfr_remove() on driver detach.
*/
int devm_stmmac_pltfr_probe(struct platform_device *pdev,
struct plat_stmmacenet_data *plat,
struct stmmac_resources *res)
{
int ret;

ret = stmmac_pltfr_probe(pdev, plat, res);
if (ret)
return ret;

return devm_add_action_or_reset(&pdev->dev, devm_stmmac_pltfr_remove,
pdev);
}
EXPORT_SYMBOL_GPL(devm_stmmac_pltfr_probe);

/**
* stmmac_pltfr_remove_no_dt
* @pdev: pointer to the platform device
Expand Down
3 changes: 3 additions & 0 deletions drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ 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);
int devm_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;
Expand Down

0 comments on commit fc9ee2a

Please sign in to comment.