drm/i915: s/plane/i9xx_plane/

Call the enum i9xx_plane_id variable i9xx_plane like we do elsewhere.

Cc: Hans de Goede <j.w.r.degoede@gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180130203807.13721-7-ville.syrjala@linux.intel.com
Reviewed-by: Mika Kahola <mika.kahola@intel.com>

diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index cf39ca90d887872ddb2de5e011041f785fda3996..cf1231f9c33bbf838942b4007c8933c8bbbd697c 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -1665,16 +1665,16 @@ static int intel_dsi_get_panel_orientation(struct intel_connector *connector)
 {
        struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
        int orientation = DRM_MODE_PANEL_ORIENTATION_NORMAL;
-       enum i9xx_plane_id plane;
+       enum i9xx_plane_id i9xx_plane;
        u32 val;
 
        if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
                if (connector->encoder->crtc_mask == BIT(PIPE_B))
-                       plane = PLANE_B;
+                       i9xx_plane = PLANE_B;
                else
-                       plane = PLANE_A;
+                       i9xx_plane = PLANE_A;
 
-               val = I915_READ(DSPCNTR(plane));
+               val = I915_READ(DSPCNTR(i9xx_plane));
                if (val & DISPPLANE_ROTATE_180)
                        orientation = DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP;
        }