drm/i915/audio: group audio under anonymous struct in drm_i915_private

With an anonymous struct, this can be pure hierarchical organization
without code changes. We'll follow up with adding a name to the
sub-struct separately.

Cc: Dave Airlie <airlied@redhat.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211104161858.21786-1-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 19e6700a4315b53752c2004d699d34bc073633cf..ee210e12648abf9283920c34a20600d802fb042a 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -995,9 +995,6 @@ struct drm_i915_private {
        /* Display internal color functions */
        const struct intel_color_funcs *color_funcs;
 
-       /* Display internal audio functions */
-       const struct intel_audio_funcs *audio_funcs;
-
        /* Display CDCLK functions */
        const struct intel_cdclk_funcs *cdclk_funcs;
 
@@ -1084,17 +1081,6 @@ struct drm_i915_private {
        struct drm_property *broadcast_rgb_property;
        struct drm_property *force_audio_property;
 
-       /* hda/i915 audio component */
-       struct i915_audio_component *audio_component;
-       bool audio_component_registered;
-       /**
-        * av_mutex - mutex for audio/video sync
-        *
-        */
-       struct mutex av_mutex;
-       int audio_power_refcount;
-       u32 audio_freq_cntrl;
-
        u32 fdi_rx_config;
 
        /* Shadow for DISPLAY_PHY_CONTROL which can't be safely read */
@@ -1227,14 +1213,29 @@ struct drm_i915_private {
 
        bool ipc_enabled;
 
-       /* Used to save the pipe-to-encoder mapping for audio */
-       struct intel_encoder *av_enc_map[I915_MAX_PIPES];
-
-       /* necessary resource sharing with HDMI LPE audio driver. */
        struct {
-               struct platform_device *platdev;
-               int     irq;
-       } lpe_audio;
+               /* Display internal audio functions */
+               const struct intel_audio_funcs *audio_funcs;
+
+               /* hda/i915 audio component */
+               struct i915_audio_component *audio_component;
+               bool audio_component_registered;
+               /**
+                * av_mutex - mutex for audio/video sync
+                */
+               struct mutex av_mutex;
+               int audio_power_refcount;
+               u32 audio_freq_cntrl;
+
+               /* Used to save the pipe-to-encoder mapping for audio */
+               struct intel_encoder *av_enc_map[I915_MAX_PIPES];
+
+               /* necessary resource sharing with HDMI LPE audio driver. */
+               struct {
+                       struct platform_device *platdev;
+                       int irq;
+               } lpe_audio;
+       };
 
        struct i915_pmu pmu;