diff options
author | James Bottomley <jejb@mulgrave.(none)> | 2005-10-28 12:21:10 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-10-28 12:21:10 -0400 |
commit | 71e0f32fbc7841d9c34949655039dcf4635540f0 (patch) | |
tree | 4694e2dddca9ef968a482ff47460bac3a2408c74 /drivers/scsi/aacraid/linit.c | |
parent | f2be34a3f30a1595f5d9c8e7d0bec4d8d3626047 (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/linit.c')
-rw-r--r-- | drivers/scsi/aacraid/linit.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 4ff29d7f5825..7a25dab48a9e 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
@@ -751,8 +751,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, | |||
751 | if (pci_enable_device(pdev)) | 751 | if (pci_enable_device(pdev)) |
752 | goto out; | 752 | goto out; |
753 | 753 | ||
754 | if (pci_set_dma_mask(pdev, 0xFFFFFFFFULL) || | 754 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) || |
755 | pci_set_consistent_dma_mask(pdev, 0xFFFFFFFFULL)) | 755 | pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) |
756 | goto out; | 756 | goto out; |
757 | /* | 757 | /* |
758 | * If the quirk31 bit is set, the adapter needs adapter | 758 | * If the quirk31 bit is set, the adapter needs adapter |
@@ -795,9 +795,9 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, | |||
795 | * address space. | 795 | * address space. |
796 | */ | 796 | */ |
797 | if (aac_drivers[index].quirks & AAC_QUIRK_31BIT) | 797 | if (aac_drivers[index].quirks & AAC_QUIRK_31BIT) |
798 | if (pci_set_dma_mask(pdev, 0xFFFFFFFFULL)) | 798 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) |
799 | goto out_free_fibs; | 799 | goto out_deinit; |
800 | 800 | ||
801 | aac->maximum_num_channels = aac_drivers[index].channels; | 801 | aac->maximum_num_channels = aac_drivers[index].channels; |
802 | aac_get_adapter_info(aac); | 802 | aac_get_adapter_info(aac); |
803 | 803 | ||