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

net: stmmac: platform: provide devm_stmmac_probe_config_dt() 



Provide a devres variant of stmmac_probe_config_dt() that allows users to
skip calling stmmac_remove_config_dt() at driver detach.

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


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

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

+41 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
  Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>

*******************************************************************************/



#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/module.h>
@@ -629,6 +630,39 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) 
	return ret;

}



static void devm_stmmac_remove_config_dt(void *data)

{

	struct plat_stmmacenet_data *plat = data;



	/* Platform data argument is unused */

	stmmac_remove_config_dt(NULL, plat);

}



/**

 * devm_stmmac_probe_config_dt

 * @pdev: platform_device structure

 * @mac: MAC address to use

 * Description: Devres variant of stmmac_probe_config_dt(). Does not require

 * the user to call stmmac_remove_config_dt() at driver detach.

 */

struct plat_stmmacenet_data *

devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)

{

	struct plat_stmmacenet_data *plat;

	int ret;



	plat = stmmac_probe_config_dt(pdev, mac);

	if (IS_ERR(plat))

		return plat;



	ret = devm_add_action_or_reset(&pdev->dev,

				       devm_stmmac_remove_config_dt, plat);

	if (ret)

		return ERR_PTR(ret);



	return plat;

}



/**

 * stmmac_remove_config_dt - undo the effects of stmmac_probe_config_dt()

 * @pdev: platform_device structure
@@ -651,12 +685,19 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) 
	return ERR_PTR(-EINVAL);

}



struct plat_stmmacenet_data *

devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)

{

	return ERR_PTR(-EINVAL);

}



void stmmac_remove_config_dt(struct platform_device *pdev,

			     struct plat_stmmacenet_data *plat)

{

}

#endif /* CONFIG_OF */

EXPORT_SYMBOL_GPL(stmmac_probe_config_dt);

EXPORT_SYMBOL_GPL(devm_stmmac_probe_config_dt);

EXPORT_SYMBOL_GPL(stmmac_remove_config_dt);



int stmmac_get_platform_resources(struct platform_device *pdev,

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

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 


struct plat_stmmacenet_data *

stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac);

struct plat_stmmacenet_data *

devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac);

void stmmac_remove_config_dt(struct platform_device *pdev,

			     struct plat_stmmacenet_data *plat);