From: Andrew Morton Date: Thu, 18 Oct 2007 10:05:07 +0000 (-0700) Subject: stop using DMA_xxBIT_MASK X-Git-Tag: v2.6.24-rc1~414 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8f286c33f1e838d631f4a3260b33efce4bc5973c;p=linux-2.6-omap-h63xx.git stop using DMA_xxBIT_MASK Now that we have DMA_BIT_MASK(), these macros are pointless. Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 29b028597dc..101a2d4636b 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -13,9 +13,15 @@ enum dma_data_direction { DMA_NONE = 3, }; -#define DMA_BIT_MASK(n) ((1ULL<<(n))-1) +#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -#define DMA_64BIT_MASK (~0ULL) +/* + * NOTE: do not use the below macros in new code and do not add new definitions + * here. + * + * Instead, just open-code DMA_BIT_MASK(n) within your driver + */ +#define DMA_64BIT_MASK DMA_BIT_MASK(64) #define DMA_48BIT_MASK DMA_BIT_MASK(48) #define DMA_47BIT_MASK DMA_BIT_MASK(47) #define DMA_40BIT_MASK DMA_BIT_MASK(40)