1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index e6a64b3ecd91..396cb59ca4b8 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1340,6 +1340,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,
         switch (crtc_state->pixel_multiplier) {
         default:
                 WARN(1, "unknown pixel multiplier specified\n");
+                /* fall through */
         case 1: rate = SDVO_CLOCK_RATE_MULT_1X; break;
         case 2: rate = SDVO_CLOCK_RATE_MULT_2X; break;
         case 4: rate = SDVO_CLOCK_RATE_MULT_4X; break;
@@ -1400,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,
@@ -2316,14 +2314,19 @@ intel_sdvo_guess_ddc_bus(struct intel_sdvo *sdvo)
         switch (sdvo->controlled_output) {
         case SDVO_OUTPUT_LVDS1:
                 mask |= SDVO_OUTPUT_LVDS1;
+                /* fall through */
         case SDVO_OUTPUT_LVDS0:
                 mask |= SDVO_OUTPUT_LVDS0;
+                /* fall through */
         case SDVO_OUTPUT_TMDS1:
                 mask |= SDVO_OUTPUT_TMDS1;
+                /* fall through */
         case SDVO_OUTPUT_TMDS0:
                 mask |= SDVO_OUTPUT_TMDS0;
+                /* fall through */
         case SDVO_OUTPUT_RGB1:
                 mask |= SDVO_OUTPUT_RGB1;
+                /* fall through */
         case SDVO_OUTPUT_RGB0:
                 mask |= SDVO_OUTPUT_RGB0;
                 break;