diff options
author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:11 -0400 |
commit | 284901a90a9e0b812ca3f5f852cbbfb60d10249d (patch) | |
tree | 06c1b5a0f83c90cfb662f756e7781977ce739ce8 /drivers/staging | |
parent | 6afd142fd0dfba497246d0fab236c20a7b4bf778 (diff) |
dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/agnx/pci.c | 4 | ||||
-rw-r--r-- | drivers/staging/altpciechdma/altpciechdma.c | 4 | ||||
-rw-r--r-- | drivers/staging/sxg/sxg.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/agnx/pci.c b/drivers/staging/agnx/pci.c index 4ff4c1601423..25c0ffd2faa0 100644 --- a/drivers/staging/agnx/pci.c +++ b/drivers/staging/agnx/pci.c | |||
@@ -477,8 +477,8 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev, | |||
477 | return err; | 477 | return err; |
478 | } | 478 | } |
479 | 479 | ||
480 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) || | 480 | if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) || |
481 | pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) { | 481 | pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) { |
482 | printk(KERN_ERR PFX "No suitable DMA available\n"); | 482 | printk(KERN_ERR PFX "No suitable DMA available\n"); |
483 | goto err_free_reg; | 483 | goto err_free_reg; |
484 | } | 484 | } |
diff --git a/drivers/staging/altpciechdma/altpciechdma.c b/drivers/staging/altpciechdma/altpciechdma.c index 6a4d0b8e0960..5869e1484a95 100644 --- a/drivers/staging/altpciechdma/altpciechdma.c +++ b/drivers/staging/altpciechdma/altpciechdma.c | |||
@@ -855,9 +855,9 @@ static int __devinit probe(struct pci_dev *dev, const struct pci_device_id *id) | |||
855 | printk(KERN_DEBUG "Using a 64-bit DMA mask.\n"); | 855 | printk(KERN_DEBUG "Using a 64-bit DMA mask.\n"); |
856 | } else | 856 | } else |
857 | #endif | 857 | #endif |
858 | if (!pci_set_dma_mask(dev, DMA_32BIT_MASK)) { | 858 | if (!pci_set_dma_mask(dev, DMA_BIT_MASK(32))) { |
859 | printk(KERN_DEBUG "Could not set 64-bit DMA mask.\n"); | 859 | printk(KERN_DEBUG "Could not set 64-bit DMA mask.\n"); |
860 | pci_set_consistent_dma_mask(dev, DMA_32BIT_MASK); | 860 | pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(32)); |
861 | /* use 32-bit DMA */ | 861 | /* use 32-bit DMA */ |
862 | printk(KERN_DEBUG "Using a 32-bit DMA mask.\n"); | 862 | printk(KERN_DEBUG "Using a 32-bit DMA mask.\n"); |
863 | } else { | 863 | } else { |
diff --git a/drivers/staging/sxg/sxg.c b/drivers/staging/sxg/sxg.c index a77e1eee5693..891f6e334672 100644 --- a/drivers/staging/sxg/sxg.c +++ b/drivers/staging/sxg/sxg.c | |||
@@ -937,13 +937,13 @@ static int sxg_entry_probe(struct pci_dev *pcidev, | |||
937 | if (!(err = pci_set_dma_mask(pcidev, DMA_BIT_MASK(64)))) { | 937 | if (!(err = pci_set_dma_mask(pcidev, DMA_BIT_MASK(64)))) { |
938 | DBG_ERROR("pci_set_dma_mask(DMA_BIT_MASK(64)) successful\n"); | 938 | DBG_ERROR("pci_set_dma_mask(DMA_BIT_MASK(64)) successful\n"); |
939 | } else { | 939 | } else { |
940 | if ((err = pci_set_dma_mask(pcidev, DMA_32BIT_MASK))) { | 940 | if ((err = pci_set_dma_mask(pcidev, DMA_BIT_MASK(32)))) { |
941 | DBG_ERROR | 941 | DBG_ERROR |
942 | ("No usable DMA configuration, aborting err[%x]\n", | 942 | ("No usable DMA configuration, aborting err[%x]\n", |
943 | err); | 943 | err); |
944 | return err; | 944 | return err; |
945 | } | 945 | } |
946 | DBG_ERROR("pci_set_dma_mask(DMA_32BIT_MASK) successful\n"); | 946 | DBG_ERROR("pci_set_dma_mask(DMA_BIT_MASK(32)) successful\n"); |
947 | } | 947 | } |
948 | 948 | ||
949 | DBG_ERROR("Call pci_request_regions\n"); | 949 | DBG_ERROR("Call pci_request_regions\n"); |