]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/bridge: move private data to the end of the struct
authorDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Sat, 17 May 2025 01:59:37 +0000 (04:59 +0300)
committerDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Tue, 20 May 2025 22:33:58 +0000 (01:33 +0300)
WHen adding HDMI fields I didn't notice the private: declaration for HPD
fields. Move private fields to the end of the struct drm_bride to have
clear distinction between private and public fields.

Reviewed-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20250517-drm-hdmi-connector-cec-v6-1-35651db6f19b@oss.qualcomm.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
include/drm/drm_bridge.h

index 4e418a29a9ff9d014d6ac0910a5d9bcf7118195e..286f6fb3fe2b80f237db85dc8459430dc82337e2 100644 (file)
@@ -977,21 +977,6 @@ struct drm_bridge {
         * @ddc: Associated I2C adapter for DDC access, if any.
         */
        struct i2c_adapter *ddc;
-       /** private: */
-       /**
-        * @hpd_mutex: Protects the @hpd_cb and @hpd_data fields.
-        */
-       struct mutex hpd_mutex;
-       /**
-        * @hpd_cb: Hot plug detection callback, registered with
-        * drm_bridge_hpd_enable().
-        */
-       void (*hpd_cb)(void *data, enum drm_connector_status status);
-       /**
-        * @hpd_data: Private data passed to the Hot plug detection callback
-        * @hpd_cb.
-        */
-       void *hpd_data;
 
        /**
         * @vendor: Vendor of the product to be used for the SPD InfoFrame
@@ -1043,6 +1028,22 @@ struct drm_bridge {
         * not used.
         */
        int hdmi_audio_dai_port;
+
+       /** private: */
+       /**
+        * @hpd_mutex: Protects the @hpd_cb and @hpd_data fields.
+        */
+       struct mutex hpd_mutex;
+       /**
+        * @hpd_cb: Hot plug detection callback, registered with
+        * drm_bridge_hpd_enable().
+        */
+       void (*hpd_cb)(void *data, enum drm_connector_status status);
+       /**
+        * @hpd_data: Private data passed to the Hot plug detection callback
+        * @hpd_cb.
+        */
+       void *hpd_data;
 };
 
 static inline struct drm_bridge *