diff options
| author | Danilo Krummrich <dakr@kernel.org> | 2026-03-14 14:21:23 +0100 |
|---|---|---|
| committer | Danilo Krummrich <dakr@kernel.org> | 2026-03-14 14:21:23 +0100 |
| commit | dc33ae50d32b509af5ae61030912fa20c79ef112 (patch) | |
| tree | 62594f3b23ef679e4bf4e1108ec3704975648678 /include/linux | |
| parent | 16de94a1b090864637c12bc6207e18d82d1972a1 (diff) | |
| parent | bb729bf1d6fdf5c2087c1651165c74cef0da1742 (diff) | |
Merge tag 'device_lock_cond_guard-7.1-rc1' into driver-core-testing
DEFINE_GUARD_COND() for device_lock_interruptible()
Introduce conditional guard version of device_lock() for scenarios that
require conditional device lock holding.
This is a stable tag for other trees to merge.
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Diffstat (limited to 'include/linux')
| -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 48a0444ccc1e..ea070aa2b39a 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -911,6 +911,7 @@ static inline void device_unlock(struct device *dev) } DEFINE_GUARD(device, struct device *, device_lock(_T), device_unlock(_T)) +DEFINE_GUARD_COND(device, _intr, device_lock_interruptible(_T), _RET == 0) static inline void device_lock_assert(struct device *dev) { |