drm/i915/audio: remove misleading checks for !eld[0]
authorJani Nikula <jani.nikula@intel.com>
Mon, 27 Oct 2014 14:26:51 +0000 (16:26 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 4 Nov 2014 22:22:12 +0000 (23:22 +0100)
We'll never end up in the hooks with eld[0] unset, as that's checked by
drm_select_eld().

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_audio.c

index f291efc8b2296d42dafa526a50c5cec08f24727f..7580b3823e304e4bbf322e237377e0aca6edfd6c 100644 (file)
@@ -79,9 +79,6 @@ static bool intel_eld_uptodate(struct drm_connector *connector,
        tmp = I915_READ(reg_eldv);
        tmp &= bits_eldv;
 
-       if (!eld[0])
-               return !tmp;
-
        if (!tmp)
                return false;
 
@@ -123,9 +120,6 @@ static void g4x_audio_codec_enable(struct drm_connector *connector,
        len = (tmp >> 9) & 0x1f;                /* ELD buffer size */
        I915_WRITE(G4X_AUD_CNTL_ST, tmp);
 
-       if (!eld[0])
-               return;
-
        len = min_t(int, eld[2], len);
        DRM_DEBUG_DRIVER("ELD size %d\n", len);
        for (i = 0; i < len; i++)
@@ -207,9 +201,6 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,
        tmp &= ~eldv;
        I915_WRITE(aud_cntrl_st2, tmp);
 
-       if (!eld[0])
-               return;
-
        tmp = I915_READ(aud_cntl_st);
        tmp &= ~IBX_ELD_ADDRESS;
        I915_WRITE(aud_cntl_st, tmp);
@@ -304,9 +295,6 @@ static void ilk_audio_codec_enable(struct drm_connector *connector,
        tmp &= ~eldv;
        I915_WRITE(aud_cntrl_st2, tmp);
 
-       if (!eld[0])
-               return;
-
        tmp = I915_READ(aud_cntl_st);
        tmp &= ~IBX_ELD_ADDRESS;
        I915_WRITE(aud_cntl_st, tmp);