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

Commit 50cf156a authored Apr 06, 2009 by Yang Hongyang Committed by Linus Torvalds Apr 07, 2009

dma-mapping: replace all DMA_40BIT_MASK macro with DMA_BIT_MASK(40)



Replace all DMA_40BIT_MASK macro with DMA_BIT_MASK(40)

Signed-off-by: Yang <Hongyang&lt;yanghy@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent e911e0d9

arch/ia64/kernel/pci-dma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ int iommu_dma_supported(struct device *dev, u64 mask)
		SAC for these. Assume all masks <= 40 bits are of this
		type. Normally this doesn't make any difference, but gives
		more gentle handling of IOMMU overflow. */
		if (iommu_sac_force && (mask >= DMA_40BIT_MASK)) {
		if (iommu_sac_force && (mask >= DMA_BIT_MASK(40))) {
		dev_info(dev, "Force SAC with mask %lx\n", mask);
		return 0;
		}

arch/x86/kernel/pci-dma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -258,7 +258,7 @@ int dma_supported(struct device *dev, u64 mask)
		SAC for these. Assume all masks <= 40 bits are of this
		type. Normally this doesn't make any difference, but gives
		more gentle handling of IOMMU overflow. */
		if (iommu_sac_force && (mask >= DMA_40BIT_MASK)) {
		if (iommu_sac_force && (mask >= DMA_BIT_MASK(40))) {
		dev_info(dev, "Force SAC with mask %Lx\n", mask);
		return 0;
		}

drivers/net/bnx2.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -7525,7 +7525,7 @@ bnx2_init_board(struct pci_dev pdev, struct net_device dev)

		/* 5708 cannot support DMA addresses > 40-bit. */
		if (CHIP_NUM(bp) == CHIP_NUM_5708)
		persist_dma_mask = dma_mask = DMA_40BIT_MASK;
		persist_dma_mask = dma_mask = DMA_BIT_MASK(40);
		else
		persist_dma_mask = dma_mask = DMA_BIT_MASK(64);

drivers/net/enic/enic_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1685,7 +1685,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
		* fail to 32-bit.
		*/

		err = pci_set_dma_mask(pdev, DMA_40BIT_MASK);
		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(40));
		if (err) {
		err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
		if (err) {
		@@ -1701,7 +1701,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
		goto err_out_release_regions;
		}
		} else {
		err = pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK);
		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40));
		if (err) {
		printk(KERN_ERR PFX
		"Unable to obtain 40-bit DMA "

drivers/net/ipg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2240,7 +2240,7 @@ static int __devinit ipg_probe(struct pci_dev *pdev,

		pci_set_master(pdev);

		rc = pci_set_dma_mask(pdev, DMA_40BIT_MASK);
		rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(40));
		if (rc < 0) {
		rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
		if (rc < 0) {