Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8e20ce94ce378334dea83a83ab26253b851100a2

Authored by Andrew Morton
Committed by Linus Torvalds
1 parent a90b037583
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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 <fujita.tomonori@lab.ntt.co.jp>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Eric Moore <Eric.Moore@lsil.com>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexander Duyck <alexander.h.duyck@intel.com>
Cc: Yi Zou <yi.zou@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 4 changed files with 13 additions and 12 deletions Side-by-side Diff

drivers/message/fusion/mptbase.c
Diff comments   View file @ 8e20ce9
... ... @@ -4414,11 +4414,11 @@
4414 4414 * 1078 errata workaround for the 36GB limitation
4415 4415 */
4416 4416 if (ioc->pcidev->device == MPI_MANUFACTPAGE_DEVID_SAS1078 &&
4417   - ioc->dma_mask > DMA_35BIT_MASK) {
  4417 + ioc->dma_mask > DMA_BIT_MASK(35)) {
4418 4418 if (!pci_set_dma_mask(ioc->pcidev, DMA_BIT_MASK(32))
4419 4419 && !pci_set_consistent_dma_mask(ioc->pcidev,
4420 4420 DMA_BIT_MASK(32))) {
4421   - dma_mask = DMA_35BIT_MASK;
  4421 + dma_mask = DMA_BIT_MASK(35);
4422 4422 d36memprintk(ioc, printk(MYIOC_s_DEBUG_FMT
4423 4423 "setting 35 bit addressing for "
4424 4424 "Request/Reply/Chain and Sense Buffers\n",
... ... @@ -4575,7 +4575,7 @@
4575 4575 alloc_dma += ioc->reply_sz;
4576 4576 }
4577 4577  
4578   - if (dma_mask == DMA_35BIT_MASK && !pci_set_dma_mask(ioc->pcidev,
  4578 + if (dma_mask == DMA_BIT_MASK(35) && !pci_set_dma_mask(ioc->pcidev,
4579 4579 ioc->dma_mask) && !pci_set_consistent_dma_mask(ioc->pcidev,
4580 4580 ioc->dma_mask))
4581 4581 d36memprintk(ioc, printk(MYIOC_s_DEBUG_FMT
... ... @@ -4602,7 +4602,7 @@
4602 4602 ioc->sense_buf_pool = NULL;
4603 4603 }
4604 4604  
4605   - if (dma_mask == DMA_35BIT_MASK && !pci_set_dma_mask(ioc->pcidev,
  4605 + if (dma_mask == DMA_BIT_MASK(35) && !pci_set_dma_mask(ioc->pcidev,
4606 4606 DMA_BIT_MASK(64)) && !pci_set_consistent_dma_mask(ioc->pcidev,
4607 4607 DMA_BIT_MASK(64)))
4608 4608 d36memprintk(ioc, printk(MYIOC_s_DEBUG_FMT
drivers/net/igbvf/netdev.c
Diff comments   View file @ 8e20ce9
... ... @@ -1281,7 +1281,7 @@
1281 1281 /* Setup the HW Tx Head and Tail descriptor pointers */
1282 1282 ew32(TDLEN(0), tx_ring->count * sizeof(union e1000_adv_tx_desc));
1283 1283 tdba = tx_ring->dma;
1284   - ew32(TDBAL(0), (tdba & DMA_32BIT_MASK));
  1284 + ew32(TDBAL(0), (tdba & DMA_BIT_MASK(32)));
1285 1285 ew32(TDBAH(0), (tdba >> 32));
1286 1286 ew32(TDH(0), 0);
1287 1287 ew32(TDT(0), 0);
... ... @@ -1367,7 +1367,7 @@
1367 1367 * the Base and Length of the Rx Descriptor Ring
1368 1368 */
1369 1369 rdba = rx_ring->dma;
1370   - ew32(RDBAL(0), (rdba & DMA_32BIT_MASK));
  1370 + ew32(RDBAL(0), (rdba & DMA_BIT_MASK(32)));
1371 1371 ew32(RDBAH(0), (rdba >> 32));
1372 1372 ew32(RDLEN(0), rx_ring->count * sizeof(union e1000_adv_rx_desc));
1373 1373 rx_ring->head = E1000_RDH(0);
1374 1374  
1375 1375  
1376 1376  
... ... @@ -2628,15 +2628,16 @@
2628 2628 return err;
2629 2629  
2630 2630 pci_using_dac = 0;
2631   - err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
  2631 + err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
2632 2632 if (!err) {
2633   - err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
  2633 + err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
2634 2634 if (!err)
2635 2635 pci_using_dac = 1;
2636 2636 } else {
2637   - err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
  2637 + err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
2638 2638 if (err) {
2639   - err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
  2639 + err = pci_set_consistent_dma_mask(pdev,
  2640 + DMA_BIT_MASK(32));
2640 2641 if (err) {
2641 2642 dev_err(&pdev->dev, "No usable DMA "
2642 2643 "configuration, aborting\n");
drivers/net/ixgbe/ixgbe_fcoe.c
Diff comments   View file @ 8e20ce9
... ... @@ -251,7 +251,7 @@
251 251 /* program DMA context */
252 252 hw = &adapter->hw;
253 253 spin_lock_bh(&fcoe->lock);
254   - IXGBE_WRITE_REG(hw, IXGBE_FCPTRL, ddp->udp & DMA_32BIT_MASK);
  254 + IXGBE_WRITE_REG(hw, IXGBE_FCPTRL, ddp->udp & DMA_BIT_MASK(32));
255 255 IXGBE_WRITE_REG(hw, IXGBE_FCPTRH, (u64)ddp->udp >> 32);
256 256 IXGBE_WRITE_REG(hw, IXGBE_FCBUFF, fcbuff);
257 257 IXGBE_WRITE_REG(hw, IXGBE_FCDMARW, fcdmarw);
sound/pci/lx6464es/lx6464es.c
Diff comments   View file @ 8e20ce9
... ... @@ -988,7 +988,7 @@
988 988 pci_set_master(pci);
989 989  
990 990 /* check if we can restrict PCI DMA transfers to 32 bits */
991   - err = pci_set_dma_mask(pci, DMA_32BIT_MASK);
  991 + err = pci_set_dma_mask(pci, DMA_BIT_MASK(32));
992 992 if (err < 0) {
993 993 snd_printk(KERN_ERR "architecture does not support "
994 994 "32bit PCI busmaster DMA\n");