aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aacraid/aachba.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@mulgrave.(none)>2005-10-28 12:21:10 -0400
committerJames Bottomley <jejb@mulgrave.(none)>2005-10-28 12:21:10 -0400
commit71e0f32fbc7841d9c34949655039dcf4635540f0 (patch)
tree4694e2dddca9ef968a482ff47460bac3a2408c74 /drivers/scsi/aacraid/aachba.c
parentf2be34a3f30a1595f5d9c8e7d0bec4d8d3626047 (diff)
[SCSI] aacraid: Use DMA mask defines
From: Mark Haverkamp <markh@osdl.org> Received from Mark Salyzyn. This patch changes the driver over to utilizing the DMA_64BIT_MASK and DMA_32BIT_MASK manifests. Applies to the scsi-rc-fixes-2.6 git tree. Signed-off-by: Mark Haverkamp <markh@osdl.org> Rejects fixed up and Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aacraid/aachba.c')
-rw-r--r--drivers/scsi/aacraid/aachba.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index a8e3dfcd0dc7..b864d3d4d133 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -785,12 +785,12 @@ int aac_get_adapter_info(struct aac_dev* dev)
785 dev->dac_support = (dacmode!=0); 785 dev->dac_support = (dacmode!=0);
786 } 786 }
787 if(dev->dac_support != 0) { 787 if(dev->dac_support != 0) {
788 if (!pci_set_dma_mask(dev->pdev, 0xFFFFFFFFFFFFFFFFULL) && 788 if (!pci_set_dma_mask(dev->pdev, DMA_64BIT_MASK) &&
789 !pci_set_consistent_dma_mask(dev->pdev, 0xFFFFFFFFFFFFFFFFULL)) { 789 !pci_set_consistent_dma_mask(dev->pdev, DMA_64BIT_MASK)) {
790 printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n", 790 printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",
791 dev->name, dev->id); 791 dev->name, dev->id);
792 } else if (!pci_set_dma_mask(dev->pdev, 0xFFFFFFFFULL) && 792 } else if (!pci_set_dma_mask(dev->pdev, DMA_32BIT_MASK) &&
793 !pci_set_consistent_dma_mask(dev->pdev, 0xFFFFFFFFULL)) { 793 !pci_set_consistent_dma_mask(dev->pdev, DMA_32BIT_MASK)) {
794 printk(KERN_INFO"%s%d: DMA mask set failed, 64 Bit DAC disabled\n", 794 printk(KERN_INFO"%s%d: DMA mask set failed, 64 Bit DAC disabled\n",
795 dev->name, dev->id); 795 dev->name, dev->id);
796 dev->dac_support = 0; 796 dev->dac_support = 0;