Commit 063a2b45 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

Merge tag 'gpiod-devm-is-action-added-for-v6.16-rc1' into gpio/for-next 

Immutable tag for the driver core tree to pull from

devres: Move devm_*_action*() APIs to devres.h
devres: Add devm_is_action_added() helper
parents 417b0f8d e383bb8f

drivers/base/devres.c

+11 −0
Original line number Diff line number Diff line
@@ -759,6 +759,17 @@ int __devm_add_action(struct device *dev, void (*action)(void *), void *data, co 
}

EXPORT_SYMBOL_GPL(__devm_add_action);



bool devm_is_action_added(struct device *dev, void (*action)(void *), void *data)

{

	struct action_devres devres = {

		.data = data,

		.action = action,

	};



	return devres_find(dev, devm_action_release, devm_action_match, &devres);

}

EXPORT_SYMBOL_GPL(devm_is_action_added);



/**

 * devm_remove_action_nowarn() - removes previously added custom action

 * @dev: Device that owns the action

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

+41 −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,44 @@ 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)



bool devm_is_action_added(struct device *dev, void (*action)(void *), void *data);



#endif /* _DEVICE_DEVRES_H_ */