From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
gcc doesn't like extra stuff in the fall through comments.
Replace them with the standard form.
Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
---
src/sna/gen4_render.c | 6 +++---
src/sna/gen5_render.c | 6 +++---
src/sna/gen6_render.c | 6 +++---
src/sna/gen7_render.c | 6 +++---
src/sna/gen8_render.c | 6 +++---
src/sna/gen9_render.c | 6 +++---
src/sna/sna_dri2.c | 4 ++--
src/sna/sna_render.h | 2 +-
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index ae26debf049a..5a4f968d0268 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -2019,7 +2019,7 @@ gen4_render_composite(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->src, 0))
goto cleanup_dst;
- /* fall through to fixup */
+ /* fall through */
case 1:
if (mask == NULL &&
sna_blt_composite__convert(sna,
@@ -2071,7 +2071,7 @@ gen4_render_composite(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->mask, 0))
goto cleanup_src;
- /* fall through to fixup */
+ /* fall through */
case 1:
gen4_composite_channel_convert(&tmp->mask);
break;
@@ -2328,7 +2328,7 @@ gen4_render_composite_spans(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->base.src, 0))
goto cleanup_dst;
- /* fall through to fixup */
+ /* fall through */
case 1:
gen4_composite_channel_convert(&tmp->base.src);
break;
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 3d9d35f113aa..3b1f25aacb39 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -1972,7 +1972,7 @@ gen5_render_composite(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->src, 0))
goto cleanup_dst;
- /* fall through to fixup */
+ /* fall through */
case 1:
if (mask == NULL &&
sna_blt_composite__convert(sna,
@@ -2023,7 +2023,7 @@ gen5_render_composite(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->mask, 0))
goto cleanup_src;
- /* fall through to fixup */
+ /* fall through */
case 1:
gen5_composite_channel_convert(&tmp->mask);
break;
@@ -2268,7 +2268,7 @@ gen5_render_composite_spans(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->base.src, 0))
goto cleanup_dst;
- /* fall through to fixup */
+ /* fall through */
case 1:
gen5_composite_channel_convert(&tmp->base.src);
break;
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 9eefcbda3e26..1a64d5b915e3 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -2346,7 +2346,7 @@ gen6_render_composite(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->src, 0))
goto cleanup_dst;
- /* fall through to fixup */
+ /* fall through */
case 1:
/* Did we just switch rings to prepare the source? */
if (mask == NULL &&
@@ -2399,7 +2399,7 @@ gen6_render_composite(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->mask, 0))
goto cleanup_src;
- /* fall through to fixup */
+ /* fall through */
case 1:
gen6_composite_channel_convert(&tmp->mask);
break;
@@ -2653,7 +2653,7 @@ gen6_render_composite_spans(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->base.src, 0))
goto cleanup_dst;
- /* fall through to fixup */
+ /* fall through */
case 1:
gen6_composite_channel_convert(&tmp->base.src);
break;
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index a33ba902d665..f58f39d457dc 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -2576,7 +2576,7 @@ gen7_render_composite(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->src, 0))
goto cleanup_dst;
- /* fall through to fixup */
+ /* fall through */
case 1:
/* Did we just switch rings to prepare the source? */
if (mask == NULL &&
@@ -2629,7 +2629,7 @@ gen7_render_composite(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->mask, 0))
goto cleanup_src;
- /* fall through to fixup */
+ /* fall through */
case 1:
gen7_composite_channel_convert(&tmp->mask);
break;
@@ -2863,7 +2863,7 @@ gen7_render_composite_spans(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->base.src, 0))
goto cleanup_dst;
- /* fall through to fixup */
+ /* fall through */
case 1:
gen7_composite_channel_convert(&tmp->base.src);
break;
diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
index 5d09c2cca94f..0955f90e0c37 100644
--- a/src/sna/gen8_render.c
+++ b/src/sna/gen8_render.c
@@ -2405,7 +2405,7 @@ gen8_render_composite(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->src, 0))
goto cleanup_dst;
- /* fall through to fixup */
+ /* fall through */
case 1:
/* Did we just switch rings to prepare the source? */
if (mask == NULL &&
@@ -2461,7 +2461,7 @@ gen8_render_composite(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->mask, 0))
goto cleanup_src;
- /* fall through to fixup */
+ /* fall through */
case 1:
if (!gen8_composite_channel_convert(&tmp->mask))
goto cleanup_mask;
@@ -2696,7 +2696,7 @@ gen8_render_composite_spans(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->base.src, 0))
goto cleanup_dst;
- /* fall through to fixup */
+ /* fall through */
case 1:
if (!gen8_composite_channel_convert(&tmp->base.src))
goto cleanup_src;
diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c
index 469084990264..06c1f9a32145 100644
--- a/src/sna/gen9_render.c
+++ b/src/sna/gen9_render.c
@@ -2483,7 +2483,7 @@ gen9_render_composite(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->src, 0))
goto cleanup_dst;
- /* fall through to fixup */
+ /* fall through */
case 1:
/* Did we just switch rings to prepare the source? */
if (mask == NULL &&
@@ -2539,7 +2539,7 @@ gen9_render_composite(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->mask, 0))
goto cleanup_src;
- /* fall through to fixup */
+ /* fall through */
case 1:
if (!gen9_composite_channel_convert(&tmp->mask))
goto cleanup_mask;
@@ -2774,7 +2774,7 @@ gen9_render_composite_spans(struct sna *sna,
case 0:
if (!gen4_channel_init_solid(sna, &tmp->base.src, 0))
goto cleanup_dst;
- /* fall through to fixup */
+ /* fall through */
case 1:
if (!gen9_composite_channel_convert(&tmp->base.src))
goto cleanup_src;
diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 6426a38626af..daa71dc6db30 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -2601,7 +2601,7 @@ void sna_dri2_vblank_handler(struct drm_event_vblank *event)
sna_dri2_flip(info))
return;
- /* else fall through to blit */
+ /* fall through */
case SWAP:
assert(info->signal);
if (can_xchg(info->sna, draw, info->front, info->back)) {
@@ -2623,7 +2623,7 @@ void sna_dri2_vblank_handler(struct drm_event_vblank *event)
DBG(("%s -- requeue failed, errno=%d\n", __FUNCTION__, errno));
assert(info->pending.bo == NULL);
assert(info->keepalive == 1);
- /* fall through to SwapComplete */
+ /* fall through */
case SWAP_COMPLETE:
DBG(("%s: %d complete, frame=%d tv=%d.%06d\n",
__FUNCTION__, info->type,
diff --git a/src/sna/sna_render.h b/src/sna/sna_render.h
index 891fc905fad2..7599803211fc 100644
--- a/src/sna/sna_render.h
+++ b/src/sna/sna_render.h
@@ -823,7 +823,7 @@ sna_get_pixel_from_rgba(uint32_t * pixel,
switch (format) {
case PICT_x8r8g8b8:
alpha = 0xffff;
- /* fall through to re-use a8r8g8b8 expansion */
+ /* fall through */
case PICT_a8r8g8b8:
*pixel = ((alpha >> 8 << 24) |
(red >> 8 << 16) |
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
