Commit f5e5631d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Bartosz Golaszewski
Browse files

devres: Move devm_*_action*() APIs to devres.h 



We have a newly created header linux/device/devres.h that gathers
device managed APIs, so users won't need to include entire device.h
for only these ones. Move devm_*_action*() APIs to devres.h as well.

Reviewed-by: default avatarRaag Jadav <raag.jadav@intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarZijun Hu <quic_zijuhu@quicinc.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20250220162238.2738038-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 0af2f6be

include/linux/device.h

+0 −38
Original line number Diff line number Diff line
@@ -281,44 +281,6 @@ int __must_check device_create_bin_file(struct device *dev, 
void device_remove_bin_file(struct device *dev,

			    const struct bin_attribute *attr);



/* allows to add/remove a custom action to devres stack */

int devm_remove_action_nowarn(struct device *dev, void (*action)(void *), void *data);



/**

 * devm_remove_action() - removes previously added custom action

 * @dev: Device that owns the action

 * @action: Function implementing the action

 * @data: Pointer to data passed to @action implementation

 *

 * Removes instance of @action previously added by devm_add_action().

 * Both action and data should match one of the existing entries.

 */

static inline

void devm_remove_action(struct device *dev, void (*action)(void *), void *data)

{

	WARN_ON(devm_remove_action_nowarn(dev, action, data));

}



void devm_release_action(struct device *dev, void (*action)(void *), void *data);



int __devm_add_action(struct device *dev, void (*action)(void *), void *data, const char *name);

#define devm_add_action(dev, action, data) \

	__devm_add_action(dev, action, data, #action)



static inline int __devm_add_action_or_reset(struct device *dev, void (*action)(void *),

					     void *data, const char *name)

{

	int ret;



	ret = __devm_add_action(dev, action, data, name);

	if (ret)

		action(data);



	return ret;

}

#define devm_add_action_or_reset(dev, action, data) \

	__devm_add_action_or_reset(dev, action, data, #action)



/**

 * devm_alloc_percpu - Resource-managed alloc_percpu

 * @dev: Device to allocate per-cpu memory for

include/linux/device/devres.h

+39 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/overflow.h>

#include <linux/stdarg.h>

#include <linux/types.h>

#include <asm/bug.h>



struct device;

struct device_node;
@@ -126,4 +127,42 @@ void __iomem *devm_of_iomap(struct device *dev, struct device_node *node, int in 


#endif



/* allows to add/remove a custom action to devres stack */

int devm_remove_action_nowarn(struct device *dev, void (*action)(void *), void *data);



/**

 * devm_remove_action() - removes previously added custom action

 * @dev: Device that owns the action

 * @action: Function implementing the action

 * @data: Pointer to data passed to @action implementation

 *

 * Removes instance of @action previously added by devm_add_action().

 * Both action and data should match one of the existing entries.

 */

static inline

void devm_remove_action(struct device *dev, void (*action)(void *), void *data)

{

	WARN_ON(devm_remove_action_nowarn(dev, action, data));

}



void devm_release_action(struct device *dev, void (*action)(void *), void *data);



int __devm_add_action(struct device *dev, void (*action)(void *), void *data, const char *name);

#define devm_add_action(dev, action, data) \

	__devm_add_action(dev, action, data, #action)



static inline int __devm_add_action_or_reset(struct device *dev, void (*action)(void *),

					     void *data, const char *name)

{

	int ret;



	ret = __devm_add_action(dev, action, data, name);

	if (ret)

		action(data);



	return ret;

}

#define devm_add_action_or_reset(dev, action, data) \

	__devm_add_action_or_reset(dev, action, data, #action)



#endif /* _DEVICE_DEVRES_H_ */