Re: [PATCH -mm] dma-mapping.h: add the dma_unmap state API

[Andrew Morton <akpm@linux-foundation.org>]

On Sat, 13 Feb 2010 11:49:09 +0900 FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> wrote:

> On Fri, 12 Feb 2010 11:51:57 -0800
> Andrew Morton <akpm@linux-foundation.org> wrote:
> 
> > > -#ifdef CONFIG_NEED_DMA_MAP_STATE
> > > -#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)        dma_addr_t ADDR_NAME;
> > > -#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)          __u32 LEN_NAME;
> > 
> > But we already screwed up the semicolon thing.  If you grep the tree you'll
> > see that about half of the users of this macro added their own semicolon:
> 
> Yeah, I know. PCI-DMA-mapping.txt says:
> 
> NOTE: DO NOT put a semicolon at the end of the DECLARE_*() macro.
> 
> 
> But there are some other DECLARE_ macros that don't have the
> semicolons so users could be easily confused.

yup.  Users already got confused.

> #define DEFINE_DMA_MAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME
> 
> looks better?

yes.  People expect to have to put the semicolon in there, so they do.

> 
> > ./drivers/net/cxgb3/sge.c:              DECLARE_PCI_UNMAP_ADDR(addr);
> > ./drivers/net/skge.h:   DECLARE_PCI_UNMAP_ADDR(mapaddr);
> > ./drivers/net/qla3xxx.h:         DECLARE_PCI_UNMAP_ADDR(mapaddr);
> > ./drivers/net/qla3xxx.h:         DECLARE_PCI_UNMAP_ADDR(mapaddr);
> > ./drivers/net/tg3.h:    DECLARE_PCI_UNMAP_ADDR(mapping)
> > 
> > 
> > Perhaps someone will clean all that up sometime.
> 
> I plan to replace these PCI API with the new generic API so I can take
> care of them together.

cool.