| Message ID | 20171108202725.GA7246@embeddedor.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 09 Nov 2017, Jani Nikula <jani.nikula@linux.intel.com> wrote: > On Wed, 08 Nov 2017, "Gustavo A. R. Silva" <garsilva@embeddedor.com> wrote: >> In preparation to enabling -Wimplicit-fallthrough, mark switch cases >> where we are expecting to fall through. >> >> Addresses-Coverity-ID: 141432 >> Addresses-Coverity-ID: 141433 >> Addresses-Coverity-ID: 141434 >> Addresses-Coverity-ID: 141435 >> Addresses-Coverity-ID: 141436 >> Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com> > > Acked-by: Jani Nikula <jani.nikula@intel.com> More explicitly, the patch looks good, but I'll give others the chance to chime in before merging. In particular Chris has been doing plenty of warning fixes lately. BR, Jani. > >> --- >> drivers/gpu/drm/i915/intel_sdvo.c | 11 ++++++----- >> 1 file changed, 6 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c >> index 7437944..921e372 100644 >> --- a/drivers/gpu/drm/i915/intel_sdvo.c >> +++ b/drivers/gpu/drm/i915/intel_sdvo.c >> @@ -1327,6 +1327,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; >> @@ -2274,15 +2275,15 @@ intel_sdvo_guess_ddc_bus(struct intel_sdvo *sdvo) >> */ >> switch (sdvo->controlled_output) { >> case SDVO_OUTPUT_LVDS1: >> - mask |= SDVO_OUTPUT_LVDS1; >> + mask |= SDVO_OUTPUT_LVDS1; /* fall through */ >> case SDVO_OUTPUT_LVDS0: >> - mask |= SDVO_OUTPUT_LVDS0; >> + mask |= SDVO_OUTPUT_LVDS0; /* fall through */ >> case SDVO_OUTPUT_TMDS1: >> - mask |= SDVO_OUTPUT_TMDS1; >> + mask |= SDVO_OUTPUT_TMDS1; /* fall through */ >> case SDVO_OUTPUT_TMDS0: >> - mask |= SDVO_OUTPUT_TMDS0; >> + mask |= SDVO_OUTPUT_TMDS0; /* fall through */ >> case SDVO_OUTPUT_RGB1: >> - mask |= SDVO_OUTPUT_RGB1; >> + mask |= SDVO_OUTPUT_RGB1; /* fall through */ >> case SDVO_OUTPUT_RGB0: >> mask |= SDVO_OUTPUT_RGB0; >> break;
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 7437944..921e372 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1327,6 +1327,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; @@ -2274,15 +2275,15 @@ intel_sdvo_guess_ddc_bus(struct intel_sdvo *sdvo) */ switch (sdvo->controlled_output) { case SDVO_OUTPUT_LVDS1: - mask |= SDVO_OUTPUT_LVDS1; + mask |= SDVO_OUTPUT_LVDS1; /* fall through */ case SDVO_OUTPUT_LVDS0: - mask |= SDVO_OUTPUT_LVDS0; + mask |= SDVO_OUTPUT_LVDS0; /* fall through */ case SDVO_OUTPUT_TMDS1: - mask |= SDVO_OUTPUT_TMDS1; + mask |= SDVO_OUTPUT_TMDS1; /* fall through */ case SDVO_OUTPUT_TMDS0: - mask |= SDVO_OUTPUT_TMDS0; + mask |= SDVO_OUTPUT_TMDS0; /* fall through */ case SDVO_OUTPUT_RGB1: - mask |= SDVO_OUTPUT_RGB1; + mask |= SDVO_OUTPUT_RGB1; /* fall through */ case SDVO_OUTPUT_RGB0: mask |= SDVO_OUTPUT_RGB0; break;
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through. Addresses-Coverity-ID: 141432 Addresses-Coverity-ID: 141433 Addresses-Coverity-ID: 141434 Addresses-Coverity-ID: 141435 Addresses-Coverity-ID: 141436 Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com> --- drivers/gpu/drm/i915/intel_sdvo.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)