Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e5695f0800f8450d9a48efb1424918d18093b00b

Authored by chas williams
Committed by David S. Miller
1 parent 56cb515628
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 2 changed files with 2 additions and 3 deletions Side-by-side Diff

... ... @@ -70,6 +70,7 @@
70 70 #include <linux/sched.h>
71 71 #include <linux/timer.h>
72 72 #include <linux/interrupt.h>
  73 +#include <linux/dma-mapping.h>
73 74 #include <asm/io.h>
74 75 #include <asm/byteorder.h>
75 76 #include <asm/uaccess.h>
... ... @@ -371,7 +372,7 @@
371 372  
372 373 if (pci_enable_device(pci_dev))
373 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 376 printk(KERN_WARNING "he: no suitable dma available\n");
376 377 err = -EIO;
377 378 goto init_one_failure;
... ... @@ -380,8 +380,6 @@
380 380 #define PCI_VENDOR_ID_FORE 0x1127
381 381 #define PCI_DEVICE_ID_FORE_HE 0x400
382 382  
383   -#define HE_DMA_MASK 0xffffffff
384   -
385 383 #define GEN_CNTL_0 0x40
386 384 #define INT_PROC_ENBL (1<<25)
387 385 #define SLAVE_ENDIAN_MODE (1<<16)