diff options
author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:10 -0400 |
commit | 6a35528a8346f6e6fd32ed7e51f04d1fa4ca2c01 (patch) | |
tree | 9caaf8645b573687bbcf3a16b5aa7dd233fed46e /drivers/scsi/megaraid | |
parent | 8a59f5d2526593c6bc1a0754c3a16ccc9ed41ce3 (diff) |
dma-mapping: replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)
Replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)
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/scsi/megaraid')
-rw-r--r-- | drivers/scsi/megaraid/megaraid_mbox.c | 2 | ||||
-rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index 805bb61dde18..b2c19449119d 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c | |||
@@ -900,7 +900,7 @@ megaraid_init_mbox(adapter_t *adapter) | |||
900 | adapter->pdev->device == PCI_DEVICE_ID_PERC4_DI_EVERGLADES) || | 900 | adapter->pdev->device == PCI_DEVICE_ID_PERC4_DI_EVERGLADES) || |
901 | (adapter->pdev->vendor == PCI_VENDOR_ID_DELL && | 901 | (adapter->pdev->vendor == PCI_VENDOR_ID_DELL && |
902 | adapter->pdev->device == PCI_DEVICE_ID_PERC4E_DI_KOBUK)) { | 902 | adapter->pdev->device == PCI_DEVICE_ID_PERC4E_DI_KOBUK)) { |
903 | if (pci_set_dma_mask(adapter->pdev, DMA_64BIT_MASK)) { | 903 | if (pci_set_dma_mask(adapter->pdev, DMA_BIT_MASK(64))) { |
904 | con_log(CL_ANN, (KERN_WARNING | 904 | con_log(CL_ANN, (KERN_WARNING |
905 | "megaraid: DMA mask for 64-bit failed\n")); | 905 | "megaraid: DMA mask for 64-bit failed\n")); |
906 | 906 | ||
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index 17ce7abe17ee..713de85771f3 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
@@ -2497,7 +2497,7 @@ megasas_set_dma_mask(struct pci_dev *pdev) | |||
2497 | * All our contollers are capable of performing 64-bit DMA | 2497 | * All our contollers are capable of performing 64-bit DMA |
2498 | */ | 2498 | */ |
2499 | if (IS_DMA64) { | 2499 | if (IS_DMA64) { |
2500 | if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) != 0) { | 2500 | if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) != 0) { |
2501 | 2501 | ||
2502 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0) | 2502 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0) |
2503 | goto fail_set_dma_mask; | 2503 | goto fail_set_dma_mask; |