summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDave Jiang <dave.jiang@intel.com>2026-03-16 20:18:12 +0300
committerDave Jiang <dave.jiang@intel.com>2026-03-16 20:18:12 +0300
commite5564e39207517c1b0e0ac4dc20a1e858484ca88 (patch)
treeb6f680071b68edfe7ce5b9316e5da35da89b15be /include
parentf338e77383789c0cae23ca3d48adcc5e9e137e3c (diff)
parentbb729bf1d6fdf5c2087c1651165c74cef0da1742 (diff)
downloadlinux-e5564e39207517c1b0e0ac4dc20a1e858484ca88.tar.xz
Merge tag 'device_lock_cond_guard-7.1-rc1' into for-7.1/cxl-consolidate-endpoint
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.
Diffstat (limited to 'include')
-rw-r--r--include/linux/device.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 0be95294b6e6..4fafee80524b 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)
{