Skip to contentSkip to conversation

drm/i915/display: Use fallthrough pseudo-keyword

PATCH New Gustavo A. R. Silva 2 participants 2 messages Oct 8, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/display: Use fallthrough pseudo-keyword

In order to enable -Wimplicit-fallthrough for Clang[1], replace the existing /* fall through */ comments with the new pseudo-keyword macro fallthrough[2].

[1] https://git.kernel.org/linus/e2079e93f562c7f7a030eb7642017ee5eabaaa10
[2] https://www.kernel.org/doc/html/v5.7/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through

---
 drivers/gpu/drm/i915/display/intel_ddi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +2 -2
index 4d06178cd76c..2941051ac3e1 100644
@@ -1090,7 +1090,7 @@ ehl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate,
 				return icl_combo_phy_ddi_translations_edp_hbr2;
 			}
 		}
-		/* fall through */
+		fallthrough;
 	default:
 		/* All combo DP and eDP ports that do not support low_vswing */
 		*n_entries = ARRAY_SIZE(ehl_combo_phy_ddi_translations_dp);
@@ -1126,7 +1126,7 @@ tgl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate,
 			*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr2);
 			return icl_combo_phy_ddi_translations_edp_hbr2;
 		}
-		/* fall through */
+		fallthrough;
 	default:
 		/* All combo DP and eDP ports that do not support low_vswing */
 		if (rate > 270000) {
Signature · 1 line
2.27.0
#1 lore raw

[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/display: Use fallthrough pseudo-keyword

== Series Details ==

== Series Details ==

Series: drm/i915/display: Use fallthrough pseudo-keyword
URL : https://patchwork.freedesktop.org/series/82486/
State : failure

== Summary ==

Applying: drm/i915/display: Use fallthrough pseudo-keyword
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_ddi.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm/i915/display: Use fallthrough pseudo-keyword When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx