Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71e0f32f authored by James Bottomley's avatar James Bottomley
Browse files

[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: default avatarMark Haverkamp <markh@osdl.org>

Rejects fixed up and
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent f2be34a3

drivers/scsi/aacraid/aachba.c

+4 −4
Original line number Diff line number Diff line
@@ -785,12 +785,12 @@ int aac_get_adapter_info(struct aac_dev* dev) 
		dev->dac_support = (dacmode!=0);

	}

	if(dev->dac_support != 0) {

		if (!pci_set_dma_mask(dev->pdev, 0xFFFFFFFFFFFFFFFFULL) &&

			!pci_set_consistent_dma_mask(dev->pdev, 0xFFFFFFFFFFFFFFFFULL)) {

		if (!pci_set_dma_mask(dev->pdev, DMA_64BIT_MASK) &&

			!pci_set_consistent_dma_mask(dev->pdev, DMA_64BIT_MASK)) {

			printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",

				dev->name, dev->id);

		} else if (!pci_set_dma_mask(dev->pdev, 0xFFFFFFFFULL) &&

			!pci_set_consistent_dma_mask(dev->pdev, 0xFFFFFFFFULL)) {

		} else if (!pci_set_dma_mask(dev->pdev, DMA_32BIT_MASK) &&

			!pci_set_consistent_dma_mask(dev->pdev, DMA_32BIT_MASK)) {

			printk(KERN_INFO"%s%d: DMA mask set failed, 64 Bit DAC disabled\n",

				dev->name, dev->id);

			dev->dac_support = 0;

drivers/scsi/aacraid/linit.c

+5 −5
Original line number Diff line number Diff line
@@ -751,8 +751,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, 
	if (pci_enable_device(pdev))

		goto out;



	if (pci_set_dma_mask(pdev, 0xFFFFFFFFULL) || 

			pci_set_consistent_dma_mask(pdev, 0xFFFFFFFFULL))

	if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) || 

			pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))

		goto out;

	/*

	 * If the quirk31 bit is set, the adapter needs adapter
@@ -795,8 +795,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, 
	 * address space.

	 */

	if (aac_drivers[index].quirks & AAC_QUIRK_31BIT)

		if (pci_set_dma_mask(pdev, 0xFFFFFFFFULL))

			goto out_free_fibs;

		if (pci_set_dma_mask(pdev, DMA_32BIT_MASK))

			goto out_deinit;

 

	aac->maximum_num_channels = aac_drivers[index].channels;

	aac_get_adapter_info(aac);