Merge branches 'apple/dart', 'arm/rockchip', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86...

[J-linux.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index d7a72a8749ea03e413868a87470b3e8df074c737..bd05b2c35e99bec20dee0e118daf3d084adfdab9 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -42,7 +42,6 @@ struct class;
 struct subsys_private;
 struct device_node;
 struct fwnode_handle;
-struct iommu_ops;
 struct iommu_group;
 struct dev_pin_info;
 struct dev_iommu;
@@ -1007,6 +1006,8 @@ static inline void device_unlock(struct device *dev)
        mutex_unlock(&dev->mutex);
 }
 
+DEFINE_GUARD(device, struct device *, device_lock(_T), device_unlock(_T))
+
 static inline void device_lock_assert(struct device *dev)
 {
        lockdep_assert_held(&dev->mutex);