drm/i915: group backlight related stuff into a struct

No functional changes.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 2962a9ab44d5..5e38a2cf95f4 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -939,9 +939,14 @@ typedef struct drm_i915_private {
         struct intel_overlay *overlay;
         unsigned int sprite_scaling_enabled;
 
+        /* backlight */
+        struct {
+                int level;
+                bool enabled;
+                struct backlight_device *device;
+        } backlight;
+
         /* LVDS info */
-        int backlight_level;  /* restore backlight to this value */
-        bool backlight_enabled;
         struct drm_display_mode *lfp_lvds_vbt_mode; /* if any */
         struct drm_display_mode *sdvo_lvds_vbt_mode; /* if any */
 
@@ -1043,8 +1048,6 @@ typedef struct drm_i915_private {
          */
         struct work_struct console_resume_work;
 
-        struct backlight_device *backlight;
-
         struct drm_property *broadcast_rgb_property;
         struct drm_property *force_audio_property;