From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754233Ab0CCXQ0 (ORCPT ); Wed, 3 Mar 2010 18:16:26 -0500 Received: from xenotime.net ([72.52.64.118]:46027 "HELO xenotime.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754196Ab0CCXQJ (ORCPT ); Wed, 3 Mar 2010 18:16:09 -0500 Message-ID: <4B8EEDB5.7060700@xenotime.net> Date: Wed, 03 Mar 2010 15:16:05 -0800 From: Randy Dunlap Organization: YPO4 User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091209 Fedora/3.0-3.fc11 Thunderbird/3.0 MIME-Version: 1.0 To: FUJITA Tomonori CC: akpm@linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH -mm] replace DECLARE_DMA_UNMAP_ADD_{ADDR,LEN} with DEFINE_DMA_UNMAP_ADD_{ADDR,LEN} References: <20100303134947G.fujita.tomonori@lab.ntt.co.jp> In-Reply-To: <20100303134947G.fujita.tomonori@lab.ntt.co.jp> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/02/10 20:50, FUJITA Tomonori wrote: > Seems that you missed the following patch? > > http://lkml.org/lkml/2010/2/13/2 > > This can be fold into dma-mappingh-add-the-dma_unmap-state-api.patch. > > Thanks, > > = > From: FUJITA Tomonori > Subject: [PATCH -mm] replace DECLARE_DMA_UNMAP_ADD_{ADDR,LEN} with DEFINE_DMA_UNMAP_ADD_{ADDR,LEN} > > Andrew pointed out: > > - adding the semicolons at the end of DECLARE_DMA_UNMAP_{ADDR|LEN} > confuses people. Hm. I'm (still) confused. Why does this patch add semi-colons at the end of DECLARE_PCI_UNMAP_{ADDR|LEN} below then? (other than it is spelled with letters "PCI" instead of "DMA") Thanks. > - they are "definitions", not "declarations". > > Signed-off-by: FUJITA Tomonori > --- > Documentation/DMA-API.txt | 8 +++----- > include/linux/dma-mapping.h | 8 ++++---- > include/linux/pci-dma.h | 12 ++++++------ > 3 files changed, 13 insertions(+), 15 deletions(-) > > diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt > index d7d9eef..0fc5728 100644 > --- a/Documentation/DMA-API.txt > +++ b/Documentation/DMA-API.txt > @@ -494,7 +494,7 @@ portable API) the following facilities are provided. > Actually, instead of describing the macros one by one, we'll > transform some example code. > > -1) Use DECLARE_DMA_UNMAP_{ADDR,LEN} in state saving structures. > +1) Use DEFINE_DMA_UNMAP_{ADDR,LEN} in state saving structures. > Example, before: > > struct ring_state { > @@ -507,12 +507,10 @@ transform some example code. > > struct ring_state { > struct sk_buff *skb; > - DECLARE_DMA_UNMAP_ADDR(mapping) > - DECLARE_DMA_UNMAP_LEN(len) > + DEFINE_DMA_UNMAP_ADDR(mapping); > + DEFINE_DMA_UNMAP_LEN(len); > }; > > -NOTE: DO NOT put a semicolon at the end of the DECLARE_*() macro. > - > 2) Use dma_unmap_{addr,len}_set to set these values. > Example, before: > > diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h > index 599d8e4..e00c5c9 100644 > --- a/include/linux/dma-mapping.h > +++ b/include/linux/dma-mapping.h > @@ -241,15 +241,15 @@ struct dma_attrs; > #endif /* CONFIG_HAVE_DMA_ATTRS */ > > #ifdef CONFIG_NEED_DMA_MAP_STATE > -#define DECLARE_DMA_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME; > -#define DECLARE_DMA_UNMAP_LEN(LEN_NAME) __u32 LEN_NAME; > +#define DEFINE_DMA_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME > +#define DEFINE_DMA_UNMAP_LEN(LEN_NAME) __u32 LEN_NAME > #define dma_unmap_addr(PTR, ADDR_NAME) ((PTR)->ADDR_NAME) > #define dma_unmap_addr_set(PTR, ADDR_NAME, VAL) (((PTR)->ADDR_NAME) = (VAL)) > #define dma_unmap_len(PTR, LEN_NAME) ((PTR)->LEN_NAME) > #define dma_unmap_len_set(PTR, LEN_NAME, VAL) (((PTR)->LEN_NAME) = (VAL)) > #else > -#define DECLARE_DMA_MAP_ADDR(ADDR_NAME) > -#define DECLARE_DMA_UNMAP_LEN(LEN_NAME) > +#define DEFINE_DMA_MAP_ADDR(ADDR_NAME) > +#define DEFINE_DMA_UNMAP_LEN(LEN_NAME) > #define dma_unmap_addr(PTR, ADDR_NAME) (0) > #define dma_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) > #define dma_unmap_len(PTR, LEN_NAME) (0) > diff --git a/include/linux/pci-dma.h b/include/linux/pci-dma.h > index 235a61e..549a041 100644 > --- a/include/linux/pci-dma.h > +++ b/include/linux/pci-dma.h > @@ -1,11 +1,11 @@ > #ifndef _LINUX_PCI_DMA_H > #define _LINUX_PCI_DMA_H > > -#define DECLARE_PCI_UNMAP_ADDR DECLARE_DMA_UNMAP_ADDR > -#define DECLARE_PCI_UNMAP_LEN DECLARE_DMA_UNMAP_LEN > -#define pci_unmap_addr dma_unmap_addr > -#define pci_unmap_addr_set dma_unmap_addr_set > -#define pci_unmap_len dma_unmap_len > -#define pci_unmap_len_set dma_unmap_len_set > +#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) DEFINE_DMA_UNMAP_ADDR(ADDR_NAME); > +#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) DEFINE_DMA_UNMAP_LEN(LEN_NAME); > +#define pci_unmap_addr dma_unmap_addr > +#define pci_unmap_addr_set dma_unmap_addr_set > +#define pci_unmap_len dma_unmap_len > +#define pci_unmap_len_set dma_unmap_len_set > > #endif -- ~Randy