diff options
| author | Joerg Roedel <jroedel@suse.de> | 2019-06-24 04:23:16 -0400 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-06-24 04:23:16 -0400 |
| commit | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (patch) | |
| tree | e19c18292231202e9cd8d484ee43f46b2c9c9ad1 /include/linux/device.h | |
| parent | 1b961423158caaae49d3900b7c9c37477bbfa9b3 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index e85264fb6616..848fc71c6ba6 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -713,6 +713,7 @@ void __iomem *devm_of_iomap(struct device *dev, | |||
| 713 | /* allows to add/remove a custom action to devres stack */ | 713 | /* allows to add/remove a custom action to devres stack */ |
| 714 | int devm_add_action(struct device *dev, void (*action)(void *), void *data); | 714 | int devm_add_action(struct device *dev, void (*action)(void *), void *data); |
| 715 | void devm_remove_action(struct device *dev, void (*action)(void *), void *data); | 715 | void devm_remove_action(struct device *dev, void (*action)(void *), void *data); |
| 716 | void devm_release_action(struct device *dev, void (*action)(void *), void *data); | ||
| 716 | 717 | ||
| 717 | static inline int devm_add_action_or_reset(struct device *dev, | 718 | static inline int devm_add_action_or_reset(struct device *dev, |
| 718 | void (*action)(void *), void *data) | 719 | void (*action)(void *), void *data) |