diff options
author | chas williams <chas@cmf.nrl.navy.mil> | 2005-04-24 21:55:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-04-24 21:55:35 -0400 |
commit | e5695f0800f8450d9a48efb1424918d18093b00b (patch) | |
tree | ebb4478c0dfa9dae51dafec9ccc5e3e878206fa6 | |
parent | 56cb515628e6a831bb76783f282a71f7285dad33 (diff) |
[ATM]: [he] Use the DMA_32BIT_MASK constant from dma-mapping.h
Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/atm/he.c | 3 | ||||
-rw-r--r-- | drivers/atm/he.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/atm/he.c b/drivers/atm/he.c index c2c31a5f4513..3022c548a132 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c | |||
@@ -70,6 +70,7 @@ | |||
70 | #include <linux/sched.h> | 70 | #include <linux/sched.h> |
71 | #include <linux/timer.h> | 71 | #include <linux/timer.h> |
72 | #include <linux/interrupt.h> | 72 | #include <linux/interrupt.h> |
73 | #include <linux/dma-mapping.h> | ||
73 | #include <asm/io.h> | 74 | #include <asm/io.h> |
74 | #include <asm/byteorder.h> | 75 | #include <asm/byteorder.h> |
75 | #include <asm/uaccess.h> | 76 | #include <asm/uaccess.h> |
@@ -371,7 +372,7 @@ he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent) | |||
371 | 372 | ||
372 | if (pci_enable_device(pci_dev)) | 373 | if (pci_enable_device(pci_dev)) |
373 | return -EIO; | 374 | return -EIO; |
374 | if (pci_set_dma_mask(pci_dev, HE_DMA_MASK) != 0) { | 375 | if (pci_set_dma_mask(pci_dev, DMA_32BIT_MASK) != 0) { |
375 | printk(KERN_WARNING "he: no suitable dma available\n"); | 376 | printk(KERN_WARNING "he: no suitable dma available\n"); |
376 | err = -EIO; | 377 | err = -EIO; |
377 | goto init_one_failure; | 378 | goto init_one_failure; |
diff --git a/drivers/atm/he.h b/drivers/atm/he.h index 1a903859343a..1dc277547a73 100644 --- a/drivers/atm/he.h +++ b/drivers/atm/he.h | |||
@@ -380,8 +380,6 @@ struct he_vcc | |||
380 | #define PCI_VENDOR_ID_FORE 0x1127 | 380 | #define PCI_VENDOR_ID_FORE 0x1127 |
381 | #define PCI_DEVICE_ID_FORE_HE 0x400 | 381 | #define PCI_DEVICE_ID_FORE_HE 0x400 |
382 | 382 | ||
383 | #define HE_DMA_MASK 0xffffffff | ||
384 | |||
385 | #define GEN_CNTL_0 0x40 | 383 | #define GEN_CNTL_0 0x40 |
386 | #define INT_PROC_ENBL (1<<25) | 384 | #define INT_PROC_ENBL (1<<25) |
387 | #define SLAVE_ENDIAN_MODE (1<<16) | 385 | #define SLAVE_ENDIAN_MODE (1<<16) |