From: Andy Moreton <[email protected]>

CodeQL reports errors for comparisons between narrow and wider
types in loop conditions [cpp/infiniteloop]. Use the wider types
to fix that.

Signed-off-by: Andy Moreton <[email protected]>
Reviewed-by: Ivan Malov <[email protected]>
Reviewed-by: Viacheslav Galaktionov <[email protected]>
---
 drivers/common/sfc_efx/base/ef10_filter.c | 2 +-
 drivers/common/sfc_efx/base/ef10_mcdi.c   | 2 +-
 drivers/common/sfc_efx/base/ef10_nvram.c  | 4 ++--
 drivers/common/sfc_efx/base/efx_bootcfg.c | 2 +-
 drivers/common/sfc_efx/base/mcdi_mon.c    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/common/sfc_efx/base/ef10_filter.c 
b/drivers/common/sfc_efx/base/ef10_filter.c
index 0d69ec5ba8..7d845f1446 100644
--- a/drivers/common/sfc_efx/base/ef10_filter.c
+++ b/drivers/common/sfc_efx/base/ef10_filter.c
@@ -1300,7 +1300,7 @@ ef10_filter_supported_filters(
        size_t mcdi_list_length;
        size_t mcdi_encap_list_length;
        size_t list_length;
-       uint32_t i;
+       size_t i;
        uint32_t next_buf_idx;
        size_t next_buf_length;
        efx_rc_t rc;
diff --git a/drivers/common/sfc_efx/base/ef10_mcdi.c 
b/drivers/common/sfc_efx/base/ef10_mcdi.c
index f852d1cde3..6f3492efe4 100644
--- a/drivers/common/sfc_efx/base/ef10_mcdi.c
+++ b/drivers/common/sfc_efx/base/ef10_mcdi.c
@@ -140,7 +140,7 @@ ef10_mcdi_send_request(
        const efx_mcdi_transport_t *emtp = enp->en_mcdi.em_emtp;
        efsys_mem_t *esmp = emtp->emt_dma_mem;
        efx_dword_t dword;
-       unsigned int pos;
+       size_t pos;
 
        EFSYS_ASSERT(EFX_FAMILY_IS_EF100(enp) || EFX_FAMILY_IS_EF10(enp));
 
diff --git a/drivers/common/sfc_efx/base/ef10_nvram.c 
b/drivers/common/sfc_efx/base/ef10_nvram.c
index ce8357fa94..fd9564760a 100644
--- a/drivers/common/sfc_efx/base/ef10_nvram.c
+++ b/drivers/common/sfc_efx/base/ef10_nvram.c
@@ -2386,7 +2386,7 @@ ef10_nvram_type_to_partn(
        efx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);
        ef10_parttbl_entry_t *parttbl = NULL;
        size_t parttbl_rows = 0;
-       unsigned int i;
+       size_t i;
 
        EFSYS_ASSERT3U(type, !=, EFX_NVRAM_INVALID);
        EFSYS_ASSERT3U(type, <, EFX_NVRAM_NTYPES);
@@ -2418,7 +2418,7 @@ ef10_nvram_partn_to_type(
        efx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);
        ef10_parttbl_entry_t *parttbl = NULL;
        size_t parttbl_rows = 0;
-       unsigned int i;
+       size_t i;
 
        EFSYS_ASSERT(typep != NULL);
 
diff --git a/drivers/common/sfc_efx/base/efx_bootcfg.c 
b/drivers/common/sfc_efx/base/efx_bootcfg.c
index c5b8182a3d..83379ea34c 100644
--- a/drivers/common/sfc_efx/base/efx_bootcfg.c
+++ b/drivers/common/sfc_efx/base/efx_bootcfg.c
@@ -140,8 +140,8 @@ efx_dhcp_csum(
        __in_bcount(size)       uint8_t const *data,
        __in                    size_t size)
 {
-       unsigned int pos;
        uint8_t checksum = 0;
+       size_t pos;
 
        for (pos = 0; pos < size; pos++)
                checksum += data[pos];
diff --git a/drivers/common/sfc_efx/base/mcdi_mon.c 
b/drivers/common/sfc_efx/base/mcdi_mon.c
index 2089840d2c..c5510e53a8 100644
--- a/drivers/common/sfc_efx/base/mcdi_mon.c
+++ b/drivers/common/sfc_efx/base/mcdi_mon.c
@@ -30,7 +30,7 @@ mcdi_mon_decode_stats(
 {
        efx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);
        efx_mon_stat_portmask_t port_mask;
-       uint16_t sensor;
+       size_t sensor;
        size_t sensor_max;
        uint32_t stat_mask[(EFX_MON_NSTATS + 31) / 32];
        uint32_t idx = 0;
-- 
2.47.3

Reply via email to