2018-06-21 20:31:55

by Geert Uytterhoeven

[permalink] [raw]
Subject: [PATCH v2] 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)

Reported-by: kbuild test robot <[email protected]>
Signed-off-by: Geert Uytterhoeven <[email protected]>
Acked-by: Greg Ungerer <[email protected]>
---
v2:
- Add Acked-by.
---
arch/m68k/include/asm/dma.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/m68k/include/asm/dma.h b/arch/m68k/include/asm/dma.h
index b0978a23bad1d7ee..ae2021964e32d36f 100644
--- a/arch/m68k/include/asm/dma.h
+++ b/arch/m68k/include/asm/dma.h
@@ -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
--
2.17.1



2018-06-22 00:21:16

by Greg Ungerer

[permalink] [raw]
Subject: Re: [PATCH v2] m68knommu: Fix typos in Coldfire 5272 DMA debug code

Hi Geert,

On 22/06/18 06:30, Geert Uytterhoeven wrote:
> 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)
>
> Reported-by: kbuild test robot <[email protected]>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Acked-by: Greg Ungerer <[email protected]>

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

Regards
Greg


> ---
> v2:
> - Add Acked-by.
> ---
> arch/m68k/include/asm/dma.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/m68k/include/asm/dma.h b/arch/m68k/include/asm/dma.h
> index b0978a23bad1d7ee..ae2021964e32d36f 100644
> --- a/arch/m68k/include/asm/dma.h
> +++ b/arch/m68k/include/asm/dma.h
> @@ -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
>

2018-06-22 06:37:51

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH v2] m68knommu: Fix typos in Coldfire 5272 DMA debug code

Hi Greg,

On Fri, Jun 22, 2018 at 2:20 AM Greg Ungerer <[email protected]> wrote:
> On 22/06/18 06:30, Geert Uytterhoeven wrote:
> > 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)
> >
> > Reported-by: kbuild test robot <[email protected]>
> > Signed-off-by: Geert Uytterhoeven <[email protected]>
> > Acked-by: Greg Ungerer <[email protected]>
>
> Do you want me to take this via the m68knommu git tree?

Yes please. Thx!

Gr{oetje,eeting}s,

Geert

--
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

2018-06-22 07:07:44

by Greg Ungerer

[permalink] [raw]
Subject: Re: [PATCH v2] m68knommu: Fix typos in Coldfire 5272 DMA debug code

Hi Geert,

On 22/06/18 16:35, Geert Uytterhoeven wrote:
> On Fri, Jun 22, 2018 at 2:20 AM Greg Ungerer <[email protected]> wrote:
>> On 22/06/18 06:30, Geert Uytterhoeven wrote:
>>> 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)
>>>
>>> Reported-by: kbuild test robot <[email protected]>
>>> Signed-off-by: Geert Uytterhoeven <[email protected]>
>>> Acked-by: Greg Ungerer <[email protected]>
>>
>> Do you want me to take this via the m68knommu git tree?
>
> Yes please. Thx!

Done!

Regards
Greg