diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-14 15:22:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-14 15:22:15 +0100 |
| commit | d8b8d43406bad7aab274ee86b7974d9a3f434306 (patch) | |
| tree | 0aca508ddb974fdfbb53e4dc67e6e005ffa90f3a /include | |
| parent | 1f0e28812ab9dd188bf4aaf56d033cfa6a89dc22 (diff) | |
| parent | 746ce4dd0ea41825a1dfa5e9d8c22e46a4cf7101 (diff) | |
| download | linux-next-d8b8d43406bad7aab274ee86b7974d9a3f434306.tar.gz linux-next-d8b8d43406bad7aab274ee86b7974d9a3f434306.zip | |
Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
# Conflicts:
# drivers/iio/adc/ade9000.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/iio/iio-gts-helper.h | 1 | ||||
| -rw-r--r-- | include/linux/iio/iio.h | 2 | ||||
| -rw-r--r-- | include/linux/notifier.h | 7 |
3 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/iio/iio-gts-helper.h b/include/linux/iio/iio-gts-helper.h index 66f830ab9b49..f63a482b82b8 100644 --- a/include/linux/iio/iio-gts-helper.h +++ b/include/linux/iio/iio-gts-helper.h @@ -7,6 +7,7 @@ #ifndef __IIO_GTS_HELPER__ #define __IIO_GTS_HELPER__ +#include <linux/errno.h> #include <linux/types.h> struct device; diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h index 711c00f67371..989c1db8fb36 100644 --- a/include/linux/iio/iio.h +++ b/include/linux/iio/iio.h @@ -789,7 +789,7 @@ DEFINE_GUARD_COND(__priv__iio_dev_mode_lock, _try_direct, * * Tries to acquire the direct mode lock with cleanup ACQUIRE() semantics and * automatically releases it at the end of the scope. It most be always paired - * with IIO_DEV_ACQUIRE_ERR(), for example (notice the scope braces):: + * with IIO_DEV_ACQUIRE_FAILED(), for example (notice the scope braces):: * * switch() { * case IIO_CHAN_INFO_RAW: { diff --git a/include/linux/notifier.h b/include/linux/notifier.h index 01b6c9d9956f..4eeae9741a6e 100644 --- a/include/linux/notifier.h +++ b/include/linux/notifier.h @@ -46,6 +46,7 @@ * often but notifier_blocks will seldom be removed. */ +struct device; struct notifier_block; typedef int (*notifier_fn_t)(struct notifier_block *nb, @@ -145,8 +146,14 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh); extern int atomic_notifier_chain_register(struct atomic_notifier_head *nh, struct notifier_block *nb); +int devm_atomic_notifier_chain_register(struct device *dev, + struct atomic_notifier_head *nh, + struct notifier_block *nb); extern int blocking_notifier_chain_register(struct blocking_notifier_head *nh, struct notifier_block *nb); +int devm_blocking_notifier_chain_register(struct device *dev, + struct blocking_notifier_head *nh, + struct notifier_block *nb); extern int raw_notifier_chain_register(struct raw_notifier_head *nh, struct notifier_block *nb); extern int srcu_notifier_chain_register(struct srcu_notifier_head *nh, |