aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
-rw-r--r--sound/pci/ali5451/ali5451.c4
4 files changed, 7 insertions, 7 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;
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 4edf270a7809..c551006e2920 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2186,8 +2186,8 @@ static int __devinit snd_ali_create(struct snd_card *card,
2186 if (err < 0) 2186 if (err < 0)
2187 return err; 2187 return err;
2188 /* check, if we can restrict PCI DMA transfers to 31 bits */ 2188 /* check, if we can restrict PCI DMA transfers to 31 bits */
2189 if (pci_set_dma_mask(pci, DMA_31BIT_MASK) < 0 || 2189 if (pci_set_dma_mask(pci, DMA_BIT_MASK(31)) < 0 ||
2190 pci_set_consistent_dma_mask(pci, DMA_31BIT_MASK) < 0) { 2190 pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(31)) < 0) {
2191 snd_printk(KERN_ERR "architecture does not support " 2191 snd_printk(KERN_ERR "architecture does not support "
2192 "31bit PCI busmaster DMA\n"); 2192 "31bit PCI busmaster DMA\n");
2193 pci_disable_device(pci); 2193 pci_disable_device(pci);