From: Ville Syrjälä Date: Thu, 21 Jun 2018 17:46:58 +0000 (+0300) Subject: drm/i915: Remove pointless if-else from sdvo code X-Git-Tag: for-linus-20180825~57^2~25^2~46 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9757973f41b52cd8fa7850100b8b0ae85261bcc5;p=linux-2.6-block.git drm/i915: Remove pointless if-else from sdvo code The return value is a bool so we can just return the result of the biwise AND. The compiler will take care of the rest. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20180621174658.18823-1-ville.syrjala@linux.intel.com Reviewed-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 36f81a96b8f6..5417c54f67da 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1401,10 +1401,7 @@ static bool intel_sdvo_connector_get_hw_state(struct intel_connector *connector) intel_sdvo_get_active_outputs(intel_sdvo, &active_outputs); - if (active_outputs & intel_sdvo_connector->output_flag) - return true; - else - return false; + return active_outputs & intel_sdvo_connector->output_flag; } bool intel_sdvo_port_enabled(struct drm_i915_private *dev_priv,