driver core: Add conditional guard support for device_lock()

liming011 · Danilo Krummrich · commit bb729bf1d6fd · 2026-03-12T22:41:02.000+01:00
Introduce conditional guard version of device_lock() for scenarios that require conditional device lock holding. Suggested-by: Dan Williams <dan.j.williams@intel.com> Reviewed-by: Dan Williams <dan.j.williams@intel.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Li Ming <ming.li@zohomail.com> Link: https://patch.msgid.link/20260310-fix_access_endpoint_without_drv_check-v1-1-94fe919a0b87@zohomail.com Signed-off-by: Danilo Krummrich <dakr@kernel.org>
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -911,6 +911,7 @@ static inline void device_unlock(struct device *dev)`
`911`	`911`	`}`
`912`	`912`
`913`	`913`	`DEFINE_GUARD(device, struct device *, device_lock(_T), device_unlock(_T))`
	`914`	`+DEFINE_GUARD_COND(device, _intr, device_lock_interruptible(_T), _RET == 0)`
`914`	`915`
`915`	`916`	`static inline void device_lock_assert(struct device *dev)`
`916`	`917`	`{`