Skip to contentSkip to conversation

m68knommu: Fix typos in Coldfire 5272 DMA debug code

PATCH In review Geert Uytterhoeven 2 participants 4 messages Jun 21, 2018 – Jun 22, 2018 m68k architecture

lore
Share & tools
lore

Geert Uytterhoeven

author maintainer
#0 lore raw

PATCH v2 1/1 m68knommu: Fix typos in Coldfire 5272 DMA debug code

If DEBUG_DMA is defined:

include/asm/dma.h: In function ‘set_dma_mode’:
include/asm/dma.h:393: error: ‘dmabp’ undeclared (first use in this function) include/asm/dma.h:393: error: (Each undeclared identifier is reported only once include/asm/dma.h:393: error: for each function it appears in.) include/asm/dma.h: In function ‘set_dma_addr’:
include/asm/dma.h:424: error: ‘dmawp’ undeclared (first use in this function)

---
v2:
- Add Acked-by.

---
 arch/m68k/include/asm/dma.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/m68k/include/asm/dma.h +2 -2
index b0978a23bad1d7ee..ae2021964e32d36f 100644
@@ -390,7 +390,7 @@ static __inline__ void set_dma_mode(unsigned int dmanr, char mode)
 
 #ifdef DEBUG_DMA
   printk("%s(%d): dmanr=%d DMR[%x]=%x DIR[%x]=%x\n", __FILE__, __LINE__,
-         dmanr, (int) &dmalp[MCFDMA_DMR], dmabp[MCFDMA_DMR],
+	 dmanr, (int) &dmalp[MCFDMA_DMR], dmalp[MCFDMA_DMR],
 	 (int) &dmawp[MCFDMA_DIR], dmawp[MCFDMA_DIR]);
 #endif
 }
@@ -421,7 +421,7 @@ static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a)
 
 #ifdef DEBUG_DMA
   printk("%s(%d): dmanr=%d DMR[%x]=%x SAR[%x]=%08x DAR[%x]=%08x\n",
-	__FILE__, __LINE__, dmanr, (int) &dmawp[MCFDMA_DMR], dmawp[MCFDMA_DMR],
+	__FILE__, __LINE__, dmanr, (int) &dmalp[MCFDMA_DMR], dmalp[MCFDMA_DMR],
 	(int) &dmalp[MCFDMA_DSAR], dmalp[MCFDMA_DSAR],
 	(int) &dmalp[MCFDMA_DDAR], dmalp[MCFDMA_DDAR]);
 #endif
Signature · 1 line
2.17.1
#1 lore raw

Hi Geert,

Quoted 9 lines · Geert Uytterhoeven

If DEBUG_DMA is defined:

include/asm/dma.h: In function ‘set_dma_mode’:
include/asm/dma.h:393: error: ‘dmabp’ undeclared (first use in this function) include/asm/dma.h:393: error: (Each undeclared identifier is reported only once include/asm/dma.h:393: error: for each function it appears in.) include/asm/dma.h: In function ‘set_dma_addr’:
include/asm/dma.h:424: error: ‘dmawp’ undeclared (first use in this function)

Quoted 3 lines

Do you want me to take this via the m68knommu git tree?

Regards
Greg

Quoted 30 lines

---
v2:
- Add Acked-by.

---
  arch/m68k/include/asm/dma.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
arch/m68k/include/asm/dma.h +2 -2
index b0978a23bad1d7ee..ae2021964e32d36f 100644
@@ -390,7 +390,7 @@ static __inline__ void set_dma_mode(unsigned int dmanr, char mode)
 
  #ifdef DEBUG_DMA
    printk("%s(%d): dmanr=%d DMR[%x]=%x DIR[%x]=%x\n", __FILE__, __LINE__,
-         dmanr, (int) &dmalp[MCFDMA_DMR], dmabp[MCFDMA_DMR],
+	 dmanr, (int) &dmalp[MCFDMA_DMR], dmalp[MCFDMA_DMR],
  	 (int) &dmawp[MCFDMA_DIR], dmawp[MCFDMA_DIR]);
  #endif
  }
@@ -421,7 +421,7 @@ static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a)
 
  #ifdef DEBUG_DMA
    printk("%s(%d): dmanr=%d DMR[%x]=%x SAR[%x]=%08x DAR[%x]=%08x\n",
-	__FILE__, __LINE__, dmanr, (int) &dmawp[MCFDMA_DMR], dmawp[MCFDMA_DMR],
+	__FILE__, __LINE__, dmanr, (int) &dmalp[MCFDMA_DMR], dmalp[MCFDMA_DMR],
  	(int) &dmalp[MCFDMA_DSAR], dmalp[MCFDMA_DSAR],
  	(int) &dmalp[MCFDMA_DDAR], dmalp[MCFDMA_DDAR]);
  #endif
author maintainer
#2 lore raw

Hi Greg,

Quoted 10 lines · Greg Ungerer
Quoted 9 lines · Geert Uytterhoeven

If DEBUG_DMA is defined:

include/asm/dma.h: In function ‘set_dma_mode’:
include/asm/dma.h:393: error: ‘dmabp’ undeclared (first use in this function) include/asm/dma.h:393: error: (Each undeclared identifier is reported only once include/asm/dma.h:393: error: for each function it appears in.) include/asm/dma.h: In function ‘set_dma_addr’:
include/asm/dma.h:424: error: ‘dmawp’ undeclared (first use in this function)

Quoted 5 lines
Quoted 3 lines

Do you want me to take this via the m68knommu git tree?

Yes please. Thx!

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
#3 lore raw

Hi Geert,

Quoted 11 lines · Geert Uytterhoeven
Quoted 10 lines · Greg Ungerer
Quoted 9 lines · Geert Uytterhoeven

If DEBUG_DMA is defined:

include/asm/dma.h: In function ‘set_dma_mode’:
include/asm/dma.h:393: error: ‘dmabp’ undeclared (first use in this function) include/asm/dma.h:393: error: (Each undeclared identifier is reported only once include/asm/dma.h:393: error: for each function it appears in.) include/asm/dma.h: In function ‘set_dma_addr’:
include/asm/dma.h:424: error: ‘dmawp’ undeclared (first use in this function)

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

Do you want me to take this via the m68knommu git tree?

Yes please. Thx!

Done!

Regards
Greg