forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915/audio: remove misleading checks for !eld[0]

Browse source 
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>
This commit is contained in:
Jani Nikula 2014-10-27 16:26:51 +02:00 • committed by Daniel Vetter
parent 69bfe1a9b4
commit d806fbf5d3
1 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/gpu/drm/i915/intel_audio.c
View file

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