CVS commit: src/sys/external/bsd/drm2/include/drm

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 12:03:21 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/include/drm: bus_dma_hacks.h

Log Message:
drm: Fix index confusion and rename variables to clarify.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
    src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h
diff -u src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h:1.23 src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h:1.24
--- src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h:1.23	Sun Dec 19 11:33:59 2021
+++ src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h	Sun Dec 19 12:03:21 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma_hacks.h,v 1.23 2021/12/19 11:33:59 riastradh Exp $	*/
+/*	$NetBSD: bus_dma_hacks.h,v 1.24 2021/12/19 12:03:21 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -196,18 +196,18 @@ bus_dmamem_export_pages(bus_dma_tag_t dm
     int nsegs, struct page **pgs, unsigned npgs)
 {
 	int seg;
-	unsigned i;
+	unsigned pg;
 
-	i = 0;
+	pg = 0;
 	for (seg = 0; seg < nsegs; seg++) {
-		bus_addr_t baddr = segs[i].ds_addr;
-		bus_size_t len = segs[i].ds_len;
+		bus_addr_t baddr = segs[seg].ds_addr;
+		bus_size_t len = segs[seg].ds_len;
 
 		while (len >= PAGE_SIZE) {
 			paddr_t paddr = BUS_MEM_TO_PHYS(dmat, baddr);
 
-			KASSERT(i < npgs);
-			pgs[i++] = container_of(PHYS_TO_VM_PAGE(paddr),
+			KASSERT(pg < npgs);
+			pgs[pg++] = container_of(PHYS_TO_VM_PAGE(paddr),
 			    struct page, p_vmp);
 
 			baddr += PAGE_SIZE;
@@ -215,7 +215,7 @@ bus_dmamem_export_pages(bus_dma_tag_t dm
 		}
 		KASSERT(len == 0);
 	}
-	KASSERT(i == npgs);
+	KASSERT(pg == npgs);
 
 	return 0;
 }