Merge tag 'device_lock_cond_guard-7.1-rc1' into for-7.1/cxl-consolidate-endpoint

davejiang · davejiang · commit e5564e392075 · 2026-03-16T10:18:12.000-07:00
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.
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`	`{`