[PATCH v4 1/3] bus/pci: rename the variable in UIO secondary map logic

[Chaoyong He]

From: Zerun Fu <zerun.fu at corigine.com>

To makes the logic clearer, rename the variable 'i' into 'map_idx'
and the variable 'j' into 'i'.

Signed-off-by: Zerun Fu <zerun.fu at corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Long Wu <long.wu at corigine.com>
Reviewed-by: Peng Zhang <peng.zhang at corigine.com>
---
 drivers/bus/pci/pci_common_uio.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/bus/pci/pci_common_uio.c b/drivers/bus/pci/pci_common_uio.c
index 76c661f054..caacbb69d9 100644
--- a/drivers/bus/pci/pci_common_uio.c
+++ b/drivers/bus/pci/pci_common_uio.c
@@ -26,7 +26,7 @@ EAL_REGISTER_TAILQ(rte_uio_tailq)
 static int
 pci_uio_map_secondary(struct rte_pci_device *dev)
 {
-	int fd, i, j;
+	int fd, i, map_idx;
 	struct mapped_pci_resource *uio_res;
 	struct mapped_pci_res_list *uio_res_list =
 			RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
@@ -37,41 +37,41 @@ pci_uio_map_secondary(struct rte_pci_device *dev)
 		if (rte_pci_addr_cmp(&uio_res->pci_addr, &dev->addr))
 			continue;
 
-		for (i = 0; i != uio_res->nb_maps; i++) {
+		for (map_idx = 0; map_idx != uio_res->nb_maps; map_idx++) {
 			/*
 			 * open devname, to mmap it
 			 */
-			fd = open(uio_res->maps[i].path, O_RDWR);
+			fd = open(uio_res->maps[map_idx].path, O_RDWR);
 			if (fd < 0) {
 				RTE_LOG(ERR, EAL, "Cannot open %s: %s\n",
-					uio_res->maps[i].path, strerror(errno));
+					uio_res->maps[map_idx].path, strerror(errno));
 				return -1;
 			}
 
-			void *mapaddr = pci_map_resource(uio_res->maps[i].addr,
-					fd, (off_t)uio_res->maps[i].offset,
-					(size_t)uio_res->maps[i].size, 0);
+			void *mapaddr = pci_map_resource(uio_res->maps[map_idx].addr,
+					fd, (off_t)uio_res->maps[map_idx].offset,
+					(size_t)uio_res->maps[map_idx].size, 0);
 
 			/* fd is not needed in secondary process, close it */
 			close(fd);
-			if (mapaddr != uio_res->maps[i].addr) {
+			if (mapaddr != uio_res->maps[map_idx].addr) {
 				RTE_LOG(ERR, EAL,
 					"Cannot mmap device resource file %s to address: %p\n",
-					uio_res->maps[i].path,
-					uio_res->maps[i].addr);
+					uio_res->maps[map_idx].path,
+					uio_res->maps[map_idx].addr);
 				if (mapaddr != NULL) {
 					/* unmap addrs correctly mapped */
-					for (j = 0; j < i; j++)
+					for (i = 0; i < map_idx; i++)
 						pci_unmap_resource(
-							uio_res->maps[j].addr,
-							(size_t)uio_res->maps[j].size);
+							uio_res->maps[i].addr,
+							(size_t)uio_res->maps[i].size);
 					/* unmap addr wrongly mapped */
 					pci_unmap_resource(mapaddr,
-						(size_t)uio_res->maps[i].size);
+						(size_t)uio_res->maps[map_idx].size);
 				}
 				return -1;
 			}
-			dev->mem_resource[i].addr = mapaddr;
+			dev->mem_resource[map_idx].addr = mapaddr;
 		}
 		return 0;
 	}
-- 
2.39.1