| Message ID | 1241939066-10178-1-git-send-email-jirislaby@gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sun, 10 May 2009 09:04:26 +0200 Jiri Slaby <jirislaby@gmail.com> wrote: > Andrew, please fold into > dma-mapping: mark DMA_nBITS_MASK as deprecated > -- > > As Fujita correctly demurs, use more meaningful typedef name, so that we > now see: > warning: DMA_nnBIT_MASK is deprecated > instead of > warning: DMA_DEPRECATED is deprecated > > Signed-off-by: Jiri Slaby <jirislaby@gmail.com> > Cc: Yang Hongyang <yanghy@cn.fujitsu.com> > Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> > Cc: Ingo Molnar <mingo@elte.hu> > --- > include/linux/dma-mapping.h | 26 +++++++++++++------------- > 1 files changed, 13 insertions(+), 13 deletions(-) Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> But I think that you need to resend a version of this patch against tip. We need this patch in linux-next to warn some new users of these deprecated macros. Thanks, -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05/11/2009 04:36 AM, FUJITA Tomonori wrote: > But I think that you need to resend a version of this patch against > tip. We need this patch in linux-next to warn some new users of these > deprecated macros. It depends on Ingo if he doesn't mind to pick it up :). Anyway I though we want to merge this upstream for 1-2 releases and then wave and tell it goodbye to propagate not only to linux-next users. I would resend the patch with an entry in features removal schedule in that case. But it's up to you... -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Jiri Slaby <jirislaby@gmail.com> wrote: > On 05/11/2009 04:36 AM, FUJITA Tomonori wrote: > > But I think that you need to resend a version of this patch against > > tip. We need this patch in linux-next to warn some new users of these > > deprecated macros. > > It depends on Ingo if he doesn't mind to pick it up :). Yes, i picked it up - dma-mapping.h changes generally get reviewed by and go via the IOMMU folks and is maintained in tip:core/iommu. Ingo -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 6bf3339..38f5608 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -63,7 +63,7 @@ struct dma_map_ops { #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -typedef u64 DMA_DEPRECATED __deprecated; +typedef u64 DMA_nnBIT_MASK __deprecated; /* * NOTE: do not use the below macros in new code and do not add new definitions @@ -71,18 +71,18 @@ typedef u64 DMA_DEPRECATED __deprecated; * * Instead, just open-code DMA_BIT_MASK(n) within your driver */ -#define DMA_64BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(64) -#define DMA_48BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(48) -#define DMA_47BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(47) -#define DMA_40BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(40) -#define DMA_39BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(39) -#define DMA_35BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(35) -#define DMA_32BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(32) -#define DMA_31BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(31) -#define DMA_30BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(30) -#define DMA_29BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(29) -#define DMA_28BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(28) -#define DMA_24BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(24) +#define DMA_64BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(64) +#define DMA_48BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(48) +#define DMA_47BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(47) +#define DMA_40BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(40) +#define DMA_39BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(39) +#define DMA_35BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(35) +#define DMA_32BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(32) +#define DMA_31BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(31) +#define DMA_30BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(30) +#define DMA_29BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(29) +#define DMA_28BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(28) +#define DMA_24BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(24) #define DMA_MASK_NONE 0x0ULL
Andrew, please fold into dma-mapping: mark DMA_nBITS_MASK as deprecated -- As Fujita correctly demurs, use more meaningful typedef name, so that we now see: warning: DMA_nnBIT_MASK is deprecated instead of warning: DMA_DEPRECATED is deprecated Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Yang Hongyang <yanghy@cn.fujitsu.com> Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: Ingo Molnar <mingo@elte.hu> --- include/linux/dma-mapping.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-)