aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorYang Hongyang <yanghy@cn.fujitsu.com>2009-04-06 22:01:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 11:31:11 -0400
commit929a22a558429bd22001d6b41cf31c233c68a5e2 (patch)
treef0bb2140393d5434a423e924d262453dab76c011 /drivers
parent284901a90a9e0b812ca3f5f852cbbfb60d10249d (diff)
dma-mapping: replace all DMA_31BIT_MASK macro with DMA_BIT_MASK(31)
Replace all DMA_31BIT_MASK macro with DMA_BIT_MASK(31) 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')
-rw-r--r--drivers/scsi/aacraid/commsup.c4
-rw-r--r--drivers/scsi/aacraid/linit.c4
-rw-r--r--drivers/usb/host/ehci-pci.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 3b69c2d98dd6..956261f25181 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1206,8 +1206,8 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced)
1206 aac->fsa_dev = NULL; 1206 aac->fsa_dev = NULL;
1207 quirks = aac_get_driver_ident(index)->quirks; 1207 quirks = aac_get_driver_ident(index)->quirks;
1208 if (quirks & AAC_QUIRK_31BIT) { 1208 if (quirks & AAC_QUIRK_31BIT) {
1209 if (((retval = pci_set_dma_mask(aac->pdev, DMA_31BIT_MASK))) || 1209 if (((retval = pci_set_dma_mask(aac->pdev, DMA_BIT_MASK(31)))) ||
1210 ((retval = pci_set_consistent_dma_mask(aac->pdev, DMA_31BIT_MASK)))) 1210 ((retval = pci_set_consistent_dma_mask(aac->pdev, DMA_BIT_MASK(31)))))
1211 goto out; 1211 goto out;
1212 } else { 1212 } else {
1213 if (((retval = pci_set_dma_mask(aac->pdev, DMA_BIT_MASK(32)))) || 1213 if (((retval = pci_set_dma_mask(aac->pdev, DMA_BIT_MASK(32)))) ||
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 3c3ed4b3311a..9b97c3e016fe 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1103,8 +1103,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
1103 * to driver communication memory to be allocated below 2gig 1103 * to driver communication memory to be allocated below 2gig
1104 */ 1104 */
1105 if (aac_drivers[index].quirks & AAC_QUIRK_31BIT) 1105 if (aac_drivers[index].quirks & AAC_QUIRK_31BIT)
1106 if (pci_set_dma_mask(pdev, DMA_31BIT_MASK) || 1106 if (pci_set_dma_mask(pdev, DMA_BIT_MASK(31)) ||
1107 pci_set_consistent_dma_mask(pdev, DMA_31BIT_MASK)) 1107 pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(31)))
1108 goto out_disable_pdev; 1108 goto out_disable_pdev;
1109 1109
1110 pci_set_master(pdev); 1110 pci_set_master(pdev);
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index abb9a7706ec7..5aa8bce90e1f 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -108,7 +108,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
108 case 0x00d8: /* CK8 */ 108 case 0x00d8: /* CK8 */
109 case 0x00e8: /* CK8S */ 109 case 0x00e8: /* CK8S */
110 if (pci_set_consistent_dma_mask(pdev, 110 if (pci_set_consistent_dma_mask(pdev,
111 DMA_31BIT_MASK) < 0) 111 DMA_BIT_MASK(31)) < 0)
112 ehci_warn(ehci, "can't enable NVidia " 112 ehci_warn(ehci, "can't enable NVidia "
113 "workaround for >2GB RAM\n"); 113 "workaround for >2GB RAM\n");
114 break; 114 break;