diff options
| author |   Domen Puncer <domen@coderock.org> | 2005-06-26 18:22:14 -0400 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 18:22:14 -0400 |
| commit | 1e7f0bd8c8f2d0496ad338be5e69ff4395d77da4 (patch) | |
| tree | 8754be18382901e6143083fa8d7c7d8a76081407 /drivers/net/s2io.c | |
| parent | [PATCH] arlan: module parameter fixes (diff) | |
| download | linux-dev-1e7f0bd8c8f2d0496ad338be5e69ff4395d77da4.tar.xz linux-dev-1e7f0bd8c8f2d0496ad338be5e69ff4395d77da4.zip | |
drivers/net/: Use the DMA_{64,32}BIT_MASK constants
Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask()
This patch includes dma-mapping.h explicitly because it caused errors
on some architectures otherwise.
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details
Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 9c224eba057d..bb639a8794d4 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -42,6 +42,7 @@ #include <linux/errno.h> #include <linux/ioport.h> #include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/kernel.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> @@ -4593,19 +4594,19 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) return ret; } - if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) { + if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) { DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 64bit DMA\n"); dma_flag = TRUE; if (pci_set_consistent_dma_mask - (pdev, 0xffffffffffffffffULL)) { + (pdev, DMA_64BIT_MASK)) { DBG_PRINT(ERR_DBG, "Unable to obtain 64bit DMA for \ consistent allocations\n"); pci_disable_device(pdev); return -ENOMEM; } - } else if (!pci_set_dma_mask(pdev, 0xffffffffUL)) { + } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 32bit DMA\n"); } else { pci_disable_device(pdev); |