History

Merge tag 'v7.0-rc5' into driver-core-next

We need the driver-core fixes in here as well to build on top of.

Danilo Krummrich committed 7 months ago

Commit 14cf4062 parents 9aa64d2 c369299332 files · +3559 −1498Browse files

Showing the changes to include/linux/device (1 of 332 files). Show all

Unified · Split

include/linux/device/bus.h+4−0
@@ -65,6 +65,9 @@ struct fwnode_handle; · 64 unmodified lines
65 * this bus.65 * this bus.
66 * @pm: Power management operations of this bus, callback the specific66 * @pm: Power management operations of this bus, callback the specific
67 * device driver's pm-ops.67 * device driver's pm-ops.
68 * @driver_override: Set to true if this bus supports the driver_override
69 * mechanism, which allows userspace to force a specific
70 * driver to bind to a device via a sysfs attribute.
68 * @need_parent_lock: When probing or removing a device on this bus, the71 * @need_parent_lock: When probing or removing a device on this bus, the
69 * device core should lock the device's parent.72 * device core should lock the device's parent.
70 *73 *
@@ -106,6 +109,7 @@ struct bus_type { · 35 unmodified lines
106 109
107 const struct dev_pm_ops *pm;110 const struct dev_pm_ops *pm;
108 111
112 bool driver_override;
109 bool need_parent_lock;113 bool need_parent_lock;
110};114};
111 115