Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d806fbf5 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

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: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 69bfe1a9

drivers/gpu/drm/i915/intel_audio.c

+0 −12
Original line number Diff line number Diff line
@@ -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);