aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <bbpetkov@yahoo.de>2007-10-18 06:05:06 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 17:37:21 -0400
commit34c6538413e5648b63cb785add509f500b3a7b11 (patch)
tree3f2e1c4fe134fa123bf5047a640dee425be0a098
parent2c6221483169ddd4c04797cd7296ed4fe52fcdd7 (diff)
unify DMA_..BIT_MASK definitions: v3.1
Remove redundant DMA_..BIT_MASK definitions across two drivers. The computation of the majority of the bitmasks is done by the compiler. The initial split of the patch touching each a different file got removed due to possible git bisect breakage. Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> Cc: Jeremy Fitzhardinge <jeremy@goop.org> Cc: Muli Ben-Yehuda <muli@il.ibm.com> Cc: Jeff Garzik <jeff@garzik.org> Cc: James Bottomley <James.Bottomley@steeleye.com> Reviewed-by: Satyam Sharma <satyam@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/net/netxen/netxen_nic_main.c3
-rw-r--r--include/linux/dma-mapping.h24
2 files changed, 14 insertions, 13 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 2a1d6d7ec351..601051c584e8 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -53,9 +53,6 @@ static char netxen_nic_driver_string[] = "NetXen Network Driver version "
53#define NETXEN_ADAPTER_UP_MAGIC 777 53#define NETXEN_ADAPTER_UP_MAGIC 777
54#define NETXEN_NIC_PEG_TUNE 0 54#define NETXEN_NIC_PEG_TUNE 0
55 55
56#define DMA_32BIT_MASK 0x00000000ffffffffULL
57#define DMA_35BIT_MASK 0x00000007ffffffffULL
58
59/* Local functions to NetXen NIC driver */ 56/* Local functions to NetXen NIC driver */
60static int __devinit netxen_nic_probe(struct pci_dev *pdev, 57static int __devinit netxen_nic_probe(struct pci_dev *pdev,
61 const struct pci_device_id *ent); 58 const struct pci_device_id *ent);
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 0ebfafbd338c..29b028597dcd 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -13,16 +13,20 @@ enum dma_data_direction {
13 DMA_NONE = 3, 13 DMA_NONE = 3,
14}; 14};
15 15
16#define DMA_64BIT_MASK 0xffffffffffffffffULL 16#define DMA_BIT_MASK(n) ((1ULL<<(n))-1)
17#define DMA_48BIT_MASK 0x0000ffffffffffffULL 17
18#define DMA_40BIT_MASK 0x000000ffffffffffULL 18#define DMA_64BIT_MASK (~0ULL)
19#define DMA_39BIT_MASK 0x0000007fffffffffULL 19#define DMA_48BIT_MASK DMA_BIT_MASK(48)
20#define DMA_32BIT_MASK 0x00000000ffffffffULL 20#define DMA_47BIT_MASK DMA_BIT_MASK(47)
21#define DMA_31BIT_MASK 0x000000007fffffffULL 21#define DMA_40BIT_MASK DMA_BIT_MASK(40)
22#define DMA_30BIT_MASK 0x000000003fffffffULL 22#define DMA_39BIT_MASK DMA_BIT_MASK(39)
23#define DMA_29BIT_MASK 0x000000001fffffffULL 23#define DMA_35BIT_MASK DMA_BIT_MASK(35)
24#define DMA_28BIT_MASK 0x000000000fffffffULL 24#define DMA_32BIT_MASK DMA_BIT_MASK(32)
25#define DMA_24BIT_MASK 0x0000000000ffffffULL 25#define DMA_31BIT_MASK DMA_BIT_MASK(31)
26#define DMA_30BIT_MASK DMA_BIT_MASK(30)
27#define DMA_29BIT_MASK DMA_BIT_MASK(29)
28#define DMA_28BIT_MASK DMA_BIT_MASK(28)
29#define DMA_24BIT_MASK DMA_BIT_MASK(24)
26 30
27#define DMA_MASK_NONE 0x0ULL 31#define DMA_MASK_NONE 0x0ULL
28 32