[Intel-gfx] [PATCH 20/76] drm/i915: rip out encoder->disable/enable checks

[Daniel Vetter]

All encoders are now converted so there's no need for these checks any
more.

Signed-Off-by: Daniel Vetter <daniel.vet...@ffwll.ch>
---
 drivers/gpu/drm/i915/intel_display.c |   24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index 2f78dbd..000200f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3266,10 +3266,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
        intel_crtc_update_cursor(crtc, true);
 
 encoders:
-       for_each_encoder_on_crtc(dev, crtc, encoder) {
-               if (encoder->enable)
-                       encoder->enable(encoder);
-       }
+       for_each_encoder_on_crtc(dev, crtc, encoder)
+               encoder->enable(encoder);
 }
 
 static void ironlake_crtc_disable(struct drm_crtc *crtc)
@@ -3284,10 +3282,8 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc)
 
        /* XXX: For compatability with the crtc helper code, call the encoder's
         * disable function unconditionally for now. */
-       for_each_encoder_on_crtc(dev, crtc, encoder) {
-               if (encoder->disable)
-                       encoder->disable(encoder);
-       }
+       for_each_encoder_on_crtc(dev, crtc, encoder)
+               encoder->disable(encoder);
 
        if (!intel_crtc->active)
                return;
@@ -3411,10 +3407,8 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
        intel_crtc_update_cursor(crtc, true);
 
 encoders:
-       for_each_encoder_on_crtc(dev, crtc, encoder) {
-               if (encoder->enable)
-                       encoder->enable(encoder);
-       }
+       for_each_encoder_on_crtc(dev, crtc, encoder)
+               encoder->enable(encoder);
 }
 
 static void i9xx_crtc_disable(struct drm_crtc *crtc)
@@ -3428,10 +3422,8 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc)
 
        /* XXX: For compatability with the crtc helper code, call the encoder's
         * disable function unconditionally for now. */
-       for_each_encoder_on_crtc(dev, crtc, encoder) {
-               if (encoder->disable)
-                       encoder->disable(encoder);
-       }
+       for_each_encoder_on_crtc(dev, crtc, encoder)
+               encoder->disable(encoder);
 
        if (!intel_crtc->active)
                return;
-- 
1.7.10.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx