[RFC 2/7] drm/i915/hotplug: use container_of() to get struct intel_display

[Jani Nikula]

Get to the struct intel_display pointer, not struct drm_i915_private.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hotplug.c | 21 ++++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c 
b/drivers/gpu/drm/i915/display/intel_hotplug.c
index c69b1f5fd160..0467a7cd5256 100644
--- a/drivers/gpu/drm/i915/display/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
@@ -264,9 +264,9 @@ intel_hpd_irq_storm_switch_to_polling(struct 
drm_i915_private *dev_priv)
 
 static void intel_hpd_irq_storm_reenable_work(struct work_struct *work)
 {
-       struct drm_i915_private *dev_priv =
-               container_of(work, typeof(*dev_priv),
-                            display.hotplug.reenable_work.work);
+       struct intel_display *display = container_of(work, typeof(*display),
+                                                    
hotplug.reenable_work.work);
+       struct drm_i915_private *dev_priv = to_i915(display->drm);
        struct drm_connector_list_iter conn_iter;
        struct intel_connector *connector;
        intel_wakeref_t wakeref;
@@ -388,8 +388,8 @@ static u32 get_blocked_hpd_pin_mask(struct intel_display 
*display)
 
 static void i915_digport_work_func(struct work_struct *work)
 {
-       struct intel_display *display =
-               container_of(work, struct intel_display, hotplug.dig_port_work);
+       struct intel_display *display = container_of(work, typeof(*display),
+                                                    hotplug.dig_port_work);
        struct drm_i915_private *dev_priv = to_i915(display->drm);
        struct intel_hotplug *hotplug = &display->hotplug;
        u32 long_hpd_pin_mask, short_hpd_pin_mask;
@@ -468,8 +468,8 @@ void intel_hpd_trigger_irq(struct intel_digital_port 
*dig_port)
  */
 static void i915_hotplug_work_func(struct work_struct *work)
 {
-       struct intel_display *display =
-               container_of(work, struct intel_display, 
hotplug.hotplug_work.work);
+       struct intel_display *display = container_of(work, typeof(*display),
+                                                    hotplug.hotplug_work.work);
        struct drm_i915_private *dev_priv = to_i915(display->drm);
        struct intel_hotplug *hotplug = &display->hotplug;
        struct drm_connector_list_iter conn_iter;
@@ -784,10 +784,9 @@ static void i915_hpd_poll_detect_connectors(struct 
drm_i915_private *i915)
 
 static void i915_hpd_poll_init_work(struct work_struct *work)
 {
-       struct drm_i915_private *dev_priv =
-               container_of(work, struct drm_i915_private,
-                            display.hotplug.poll_init_work);
-       struct intel_display *display = &dev_priv->display;
+       struct intel_display *display = container_of(work, typeof(*display),
+                                                    hotplug.poll_init_work);
+       struct drm_i915_private *dev_priv = to_i915(display->drm);
        struct drm_connector_list_iter conn_iter;
        struct intel_connector *connector;
        intel_wakeref_t wakeref;
-- 
2.39.5