Un-neccesary, cosmetic changes to label names and comments

6 files changed, 11 insertions, 9 deletions

diff --git a/nuttx/arch/arm/src/armv7-a/cp15_clean_dcache.S b/nuttx/arch/arm/src/armv7-a/cp15_clean_dcache.S
index 6a244dac9..52344e854 100755
--- a/nuttx/arch/arm/src/armv7-a/cp15_clean_dcache.S
+++ b/nuttx/arch/arm/src/armv7-a/cp15_clean_dcache.S
@@ -103,11 +103,11 @@ cp15_clean_dcache:
 
 	/* Loop, cleaning each cache line by writing its contents to memory */
 
-4:
+1:
 	mcr		CP15_DCCMVAC(r0)		/* Clean data cache line to PoC by VA */
 	add		r0, r0, r2				/* R12=Next cache line */
 	cmp		r0, r1					/* Loop until all cache lines have been cleaned */
-	blo		4b
+	blo		1b
 
 	dsb
 	bx		lr
diff --git a/nuttx/arch/arm/src/armv7-a/cp15_coherent_dcache.S b/nuttx/arch/arm/src/armv7-a/cp15_coherent_dcache.S
index 3be2d666d..b46b5da05 100755
--- a/nuttx/arch/arm/src/armv7-a/cp15_coherent_dcache.S
+++ b/nuttx/arch/arm/src/armv7-a/cp15_coherent_dcache.S
@@ -120,11 +120,11 @@ cp15_coherent_dcache:
 	bic		r12, r0, r3				/* R12=aligned start address */
 
 	/* Loop, invalidating each I cache line to memory */
-2:
+1:
 	mcr		CP15_ICIMVAU(r12)		/* Invalidate instruction cache by VA to PoU */
 	add		r12, r12, r2			/* R12=Next cache line */
 	cmp		r12, r1					/* Loop until all cache lines have been invalidated */
-	blo		2b
+	blo		1b
 
 	mov		r0, #0
 	mcr		CP15_BPIALLIS(r0)		/* Invalidate entire branch predictor array Inner Shareable */
diff --git a/nuttx/arch/arm/src/armv7-a/cp15_flush_dcache.S b/nuttx/arch/arm/src/armv7-a/cp15_flush_dcache.S
index ba5b753ba..4cd5f21b0 100755
--- a/nuttx/arch/arm/src/armv7-a/cp15_flush_dcache.S
+++ b/nuttx/arch/arm/src/armv7-a/cp15_flush_dcache.S
@@ -103,11 +103,11 @@ cp15_flush_dcache:
 
 	/* Loop, cleaning and invaliding each D cache line in the address range */
 
-5:
+1:
 	mcrne	CP15_DCCIMVAC(r0)		/* Clean and invalidate data cache line by VA to PoC */
 	add		r0, r0, r2				/* R12=Next cache line */
 	cmp		r0, r1					/* Loop until all cache lines have been cleaned */
-	blo		5b
+	blo		1b
 
 	dsb
 	bx		lr
diff --git a/nuttx/arch/arm/src/armv7-a/cp15_invalidate_dcache.S b/nuttx/arch/arm/src/armv7-a/cp15_invalidate_dcache.S
index 5e0defbfc..c6658c72f 100755
--- a/nuttx/arch/arm/src/armv7-a/cp15_invalidate_dcache.S
+++ b/nuttx/arch/arm/src/armv7-a/cp15_invalidate_dcache.S
@@ -110,11 +110,11 @@ cp15_invalidate_dcache:
 	mcrne	CP15_DCCIMVAC(r1)		/* Clean and invalidate data cache line by VA to PoC */
 
 	/* Loop, invalidating each D cache line */
-3:
+1:
 	mcr		CP15_DCIMVAC(r0)		/* Invalidate data cache line by VA to PoC */
 	add		r0, r0, r2				/* R12=Next cache line */
 	cmp		r0, r1					/* Loop until all cache lines have been invalidate */
-	blo		3b
+	blo		1b
 
 	dsb
 	bx		lr
diff --git a/nuttx/arch/arm/src/armv7-a/cp15_invalidate_dcache_all.S b/nuttx/arch/arm/src/armv7-a/cp15_invalidate_dcache_all.S
index c6bbc74ab..7acb3c69f 100755
--- a/nuttx/arch/arm/src/armv7-a/cp15_invalidate_dcache_all.S
+++ b/nuttx/arch/arm/src/armv7-a/cp15_invalidate_dcache_all.S
@@ -96,6 +96,7 @@ cp15_invalidate_dcache_all:
 
 	mov		r1, #0					/* r1 = way loop counter */
 way_loop:
+
 	mov		r3, #0					/* r3 = set loop counter */
 set_loop:
 	mov		r2, r1, lsl #30			/* r2 = way loop counter << 30 */
@@ -104,6 +105,7 @@ set_loop:
 	add		r3, r3, #1				/* Increment set counter */
 	cmp		r0, r3					/* Last set? */
 	bne		set_loop				/* Keep looping if not */
+
 	add		r1, r1, #1				/* Increment the way counter */
 	cmp		r1, #4					/* Last way? (four ways assumed) */
 	bne		way_loop				/* Keep looping if not */
diff --git a/nuttx/arch/arm/src/sama5/sam_udphs.c b/nuttx/arch/arm/src/sama5/sam_udphs.c
index f02fcea8d..b5215627c 100644
--- a/nuttx/arch/arm/src/sama5/sam_udphs.c
+++ b/nuttx/arch/arm/src/sama5/sam_udphs.c
@@ -2420,7 +2420,7 @@ static void sam_dma_interrupt(struct sam_usbdev_s *priv, int epno)
 
           /* This is an OUT endpoint.  Invalidate the data cache for
            * region that just completed DMA. This will force the
-           * buffer data to be reloaded from RAM. when it is accessed
+           * buffer data to be reloaded from RAM when it is accessed.
            */
 
           DEBUGASSERT(USB_ISEPOUT(privep->ep.eplog));