[RFC PATCH v2 17/33] net/cpfl: fix build with shadow warnings enabled

Bruce Richardson
2025-11-07T15:53:05Z

Remove unnecessary variable definitions to ensure compiling with
-Wshadow enabled.

Fixes: db042ef09d26 ("net/cpfl: implement FXP rule creation and destroying")
Fixes: 41f20298ee8c ("net/cpfl: parse flow offloading hint from JSON")
Fixes: 3ca8f6b55435 ("net/cpfl: remove devargs from adapter structure")
Cc: stable@dpdk.org

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c | 2 --
drivers/net/intel/cpfl/cpfl_flow_parser.c | 6 +++---
drivers/net/intel/cpfl/cpfl_fxp_rule.h | 2 --
drivers/net/intel/cpfl/cpfl_representor.h | 2 +-
4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c b/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c
index 689ed82f18..361827cb10 100644
--- a/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c
+++ b/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c
@@ -386,8 +386,6 @@ cpfl_fxp_parse_action(struct cpfl_itf *itf,
}

if (mr_action) {
- uint32_t i;
-
for (i = 0; i < rim->mr_num; i++)
if (cpfl_parse_mod_content(itf->adapter, rinfo,
&rim->rules[rim->pr_num + i],
diff --git a/drivers/net/intel/cpfl/cpfl_flow_parser.c b/drivers/net/intel/cpfl/cpfl_flow_parser.c
index a67c773d18..e7deb619ee 100644
--- a/drivers/net/intel/cpfl/cpfl_flow_parser.c
+++ b/drivers/net/intel/cpfl/cpfl_flow_parser.c
@@ -1098,12 +1098,12 @@ cpfl_parse_fieldvectors(struct cpfl_itf *itf, struct cpfl_flow_js_fv *js_fvs, in
fv[2 * offset] = (uint8_t)(temp_fv >> 8);
fv[2 * offset + 1] = (uint8_t)(temp_fv & 0x00ff);
} else if (type == CPFL_FV_TYPE_METADATA) {
- uint16_t type, v_offset, mask;
+ uint16_t v_offset, mask;

- type = js_fv->meta.type;
v_offset = js_fv->meta.offset;
mask = js_fv->meta.mask;
- temp_fv = cpfl_metadata_read16(&itf->adapter->meta, type, v_offset) & mask;
+ temp_fv = cpfl_metadata_read16(&itf->adapter->meta, js_fv->meta.type,
+ v_offset) & mask;
fv[2 * offset] = (uint8_t)(temp_fv & 0x00ff);
fv[2 * offset + 1] = (uint8_t)(temp_fv >> 8);
} else if (type == CPFL_FV_TYPE_PROTOCOL) {
diff --git a/drivers/net/intel/cpfl/cpfl_fxp_rule.h b/drivers/net/intel/cpfl/cpfl_fxp_rule.h
index ed757b80b1..94eab6808c 100644
--- a/drivers/net/intel/cpfl/cpfl_fxp_rule.h
+++ b/drivers/net/intel/cpfl/cpfl_fxp_rule.h
@@ -53,8 +53,6 @@ struct cpfl_rule_info {
};
};

-extern struct cpfl_vport_ext *vport;
-
int cpfl_rule_process(struct cpfl_itf *itf,
struct idpf_ctlq_info *tx_cq,
struct idpf_ctlq_info *rx_cq,
diff --git a/drivers/net/intel/cpfl/cpfl_representor.h b/drivers/net/intel/cpfl/cpfl_representor.h
index d7f6e186f8..5c3d3aa3f6 100644
--- a/drivers/net/intel/cpfl/cpfl_representor.h
+++ b/drivers/net/intel/cpfl/cpfl_representor.h
@@ -21,7 +21,7 @@ struct cpfl_repr_param {
struct cpfl_vport_info *vport_info;
};

-extern struct cpfl_devargs *devargs;
+struct cpfl_devargs;

int cpfl_repr_devargs_process(struct cpfl_adapter_ext *adapter, struct cpfl_devargs *devargs);
int cpfl_repr_create(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *adapter);
--
2.48.1