convert some DMA_nnBIT_MASK() callers

We're about to make DMA_nnBIT_MASK() emit `deprecated' warnings.  Convert the
remaining stragglers which are visible to the x86_64 build.

Cc: FUJITA Tomonori <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: Eric Moore <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Alexander Duyck <[email protected]>
Cc: Yi Zou <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Andrew Morton 2009-06-18 16:49:17 -07:00 • committed by Linus Torvalds
commit 8e20ce94ce
4 changed files with 13 additions and 12 deletions

View file

@ -4414,11 +4414,11 @@ PrimeIocFifos(MPT_ADAPTER *ioc)
* 1078 errata workaround for the 36GB limitation
*/
if (ioc->pcidev->device == MPI_MANUFACTPAGE_DEVID_SAS1078 &&
ioc->dma_mask > DMA_35BIT_MASK) {
ioc->dma_mask > DMA_BIT_MASK(35)) {
if (!pci_set_dma_mask(ioc->pcidev, DMA_BIT_MASK(32))
&& !pci_set_consistent_dma_mask(ioc->pcidev,
DMA_BIT_MASK(32))) {
dma_mask = DMA_35BIT_MASK;
dma_mask = DMA_BIT_MASK(35);
d36memprintk(ioc, printk(MYIOC_s_DEBUG_FMT
"setting 35 bit addressing for "
"Request/Reply/Chain and Sense Buffers\n",
@ -4575,7 +4575,7 @@ PrimeIocFifos(MPT_ADAPTER *ioc)
alloc_dma += ioc->reply_sz;
}
if (dma_mask == DMA_35BIT_MASK && !pci_set_dma_mask(ioc->pcidev,
if (dma_mask == DMA_BIT_MASK(35) && !pci_set_dma_mask(ioc->pcidev,
ioc->dma_mask) && !pci_set_consistent_dma_mask(ioc->pcidev,
ioc->dma_mask))
d36memprintk(ioc, printk(MYIOC_s_DEBUG_FMT
@ -4602,7 +4602,7 @@ out_fail:
ioc->sense_buf_pool = NULL;
}
if (dma_mask == DMA_35BIT_MASK && !pci_set_dma_mask(ioc->pcidev,
if (dma_mask == DMA_BIT_MASK(35) && !pci_set_dma_mask(ioc->pcidev,
DMA_BIT_MASK(64)) && !pci_set_consistent_dma_mask(ioc->pcidev,
DMA_BIT_MASK(64)))
d36memprintk(ioc, printk(MYIOC_s_DEBUG_FMT