pipeline: remove unreachable branch

A previous change blamed it on compiler/ASan, while this is a real
(yet minor) issue.

This return -EINVAL is never reached since we test all combinations of
fidx and fcin booleans.
All branches end up with a return 0, factorize them.

Fixes: 84f5ac9418ea ("pipeline: fix build with ASan")
Fixes: f38913b7fb8e ("pipeline: add meter array to SWX")
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>

diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c
index 534f2f551c394735fcbc293be5f611bf189f73aa..2145ca0a427e1606bdf878e716398b0e0e834db5 100644 (file)
--- a/lib/pipeline/rte_swx_pipeline.c
+++ b/lib/pipeline/rte_swx_pipeline.c
@@ -4539,8 +4539,6 @@ instr_meter_translate(struct rte_swx_pipeline *p,
                instr->meter.color_out.struct_id = (uint8_t)color_out_struct_id;
                instr->meter.color_out.n_bits = fcout->n_bits;
                instr->meter.color_out.offset = fcout->offset / 8;
-
-               return 0;
        }
 
        /* index = HMEFT, length = HMEFT, color_in = I, color_out = MEF. */
@@ -4575,8 +4573,6 @@ instr_meter_translate(struct rte_swx_pipeline *p,
                instr->meter.color_out.struct_id = (uint8_t)color_out_struct_id;
                instr->meter.color_out.n_bits = fcout->n_bits;
                instr->meter.color_out.offset = fcout->offset / 8;
-
-               return 0;
        }
 
        /* index = I, length = HMEFT, color_in = MEFT, color_out = MEF. */
@@ -4607,8 +4603,6 @@ instr_meter_translate(struct rte_swx_pipeline *p,
                instr->meter.color_out.struct_id = (uint8_t)color_out_struct_id;
                instr->meter.color_out.n_bits = fcout->n_bits;
                instr->meter.color_out.offset = fcout->offset / 8;
-
-               return 0;
        }
 
        /* index = I, length = HMEFT, color_in = I, color_out = MEF. */
@@ -4638,11 +4632,9 @@ instr_meter_translate(struct rte_swx_pipeline *p,
                instr->meter.color_out.struct_id = (uint8_t)color_out_struct_id;
                instr->meter.color_out.n_bits = fcout->n_bits;
                instr->meter.color_out.offset = fcout->offset / 8;
-
-               return 0;
        }
 
-       return -EINVAL;
+       return 0;
 }
 
 static inline void