On Mon, Jun 01, 2020 at 08:51:59AM +0200, Sam Ravnborg wrote:
Improve the documentation for backlight_device and adapt it to kernel-doc style.
v2:
- Add short intro to all fields (Daniel)
- Updated description of update_lock (Daniel)
I like the update... but it doesn't cover what I was commenting on.
diff --git a/include/linux/backlight.h b/include/linux/backlight.h index 69a20da03035..cae1af95dd9d 100644 --- a/include/linux/backlight.h +++ b/include/linux/backlight.h @@ -14,21 +14,6 @@ #include <linux/mutex.h> #include <linux/notifier.h>
-/* Notes on locking:
- backlight_device->ops_lock is an internal backlight lock protecting the
- ops pointer and no code outside the core should need to touch it.
- Access to update_status() is serialised by the update_lock mutex since
- most drivers seem to need this and historically get it wrong.
- Most drivers don't need locking on their get_brightness() method.
- If yours does, you need to implement it in the driver. You can use the
- update_lock mutex if appropriate.
This explicitly says that drivers are permitted to use update_lock in their get_brightness() method.
- Any other use of the locks below is probably wrong.
- */
enum backlight_update_reason { BACKLIGHT_UPDATE_HOTKEY, BACKLIGHT_UPDATE_SYSFS, @@ -215,30 +200,71 @@ struct backlight_properties { enum backlight_scale scale; };
+/**
- struct backlight_device - backlight device data
- This structure holds all data required by a backlight device.
- */
struct backlight_device {
- /* Backlight properties */
- /**
* @props: Backlight properties*/
- /* Serialise access to update_status method */
- /**
* @update_lock: The lock used when calling the update_status() operation.** update_lock is an internal backlight lock that serialise access* to the update_status() operation. The backlight core holds the update_lock* when calling the update_status() operation. The update_lock shall not* be used by backlight drivers.*/
This contradicts the original comment about locking.
I'm fairly neutral about the change (AFAICT no driver actually ever uses update_lock from get_brightness) but if we add new documentation that flatly contradicts old documentary comments then I'd expect to see something in the patch description explaining that the change really is deliberate (and why it is a good change).
Daniel.