diff options
| author | Jani Nikula | 2014-10-27 15:26:51 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-11-04 23:22:12 +0100 |
| commit | d806fbf5d38f23fc1b259fee181b749665d72735 (patch) | |
| tree | e6e2c67d21070b6289dfaade96dc880abd8c55cc /drivers/gpu/drm/i915/intel_audio.c | |
| parent | drm/i915: introduce intel_audio_codec_{enable, disable} (diff) | |
| download | kernel-qcow2-linux-d806fbf5d38f23fc1b259fee181b749665d72735.tar.gz kernel-qcow2-linux-d806fbf5d38f23fc1b259fee181b749665d72735.tar.xz kernel-qcow2-linux-d806fbf5d38f23fc1b259fee181b749665d72735.zip | |
drm/i915/audio: remove misleading checks for !eld[0]
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_audio.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_audio.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index f291efc8b229..7580b3823e30 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -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); |