diff options
author | Tobias Klauser <tklauser@nuerscht.ch> | 2006-04-11 01:54:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 09:18:44 -0400 |
commit | 56b146d36db933844011d5026c6f55593037c7b8 (patch) | |
tree | e8b9bed7bf22f658f9b62bf13e512bf08f137efc /drivers/sn | |
parent | 31cc48bfeef7a021d6e29f3454a4505edcfd6daa (diff) |
[PATCH] Last DMA_xBIT_MASK cleanups
These are the last conversions of pci_set_dma_mask(),
pci_set_consistent_dma_mask() and pci_dma_supported() to use DMA_xBIT_MASK
constants from linux/dma-mapping.h
Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/sn')
-rw-r--r-- | drivers/sn/ioc3.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c index 93449a1a0065..0b49ff78efc1 100644 --- a/drivers/sn/ioc3.c +++ b/drivers/sn/ioc3.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
14 | #include <linux/dma-mapping.h> | ||
14 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
15 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
16 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
@@ -619,9 +620,9 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | |||
619 | pci_set_master(pdev); | 620 | pci_set_master(pdev); |
620 | 621 | ||
621 | #ifdef USE_64BIT_DMA | 622 | #ifdef USE_64BIT_DMA |
622 | ret = pci_set_dma_mask(pdev, 0xffffffffffffffffULL); | 623 | ret = pci_set_dma_mask(pdev, DMA_64BIT_MASK); |
623 | if (!ret) { | 624 | if (!ret) { |
624 | ret = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL); | 625 | ret = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK); |
625 | if (ret < 0) { | 626 | if (ret < 0) { |
626 | printk(KERN_WARNING "%s: Unable to obtain 64 bit DMA " | 627 | printk(KERN_WARNING "%s: Unable to obtain 64 bit DMA " |
627 | "for consistent allocations\n", | 628 | "for consistent allocations\n", |