x86-64: pci-dma.c clean-up - trivial
PATCH 1/1 x86-64: pci-dma.c clean-up - trivial
Replace hard coded DMA masks with #defines frominclude/linux/dma-mapping.h
Thanks,
Jon
Signed-off-by Jon Mason <[email protected]>
arch/x86_64/kernel/pci-dma.c +6 -6
@@ -38,7 +38,7 @@ int force_iommu __read_mostly= 0;to i386. */ struct device fallback_dev = { .bus_id ="fallback device" , - .coherent_dma_mask =0xffffffff , + .coherent_dma_mask =DMA_32BIT_MASK , .dma_mask = &fallback_dev.coherent_dma_mask, };
@@ -73,7 +73,7 @@ dma_alloc_coherent(struct device *dev, s dev = &fallback_dev; dma_mask = dev->coherent_dma_mask;if (dma_mask ==0 ) - dma_mask =0xffffffff ; + dma_mask =DMA_32BIT_MASK ;/* Don't invoke OOM killer */ gfp |= __GFP_NORETRY;
@@ -86,7 +86,7 @@ dma_alloc_coherent(struct device *dev, slarger than 16MB and in this case we have a chance of finding fitting memory in the next higher zone first. If not retry with true GFP_DMA. -AK */ -if (dma_mask <=0xffffffff ) +if (dma_mask <=DMA_32BIT_MASK ) gfp |=GFP_DMA32 ; again:
@@ -107,7 +107,7 @@ dma_alloc_coherent(struct device *dev, s/* Don't use the 16MB ZONE_DMA unless absolutely needed. It's better to use remapping first. */ -if (dma_mask <0xffffffff && !(gfp &GFP_DMA )) { +if (dma_mask <DMA_32BIT_MASK && !(gfp &GFP_DMA )) { gfp = (gfp & ~GFP_DMA32 ) |GFP_DMA ; goto again; }
@@ -170,7 +170,7 @@ int dma_supported(struct device *dev, u6/* Copied from i386. Doesn't make much sense, because it will only work for pci_alloc_coherent. The caller just has to use GFP_DMA in this case. */ -if (mask <0x00ffffff ) +if (mask <DMA_24BIT_MASK )return 0 ;/* Tell the device to use SAC when IOMMU force is on. This
@@ -185,7 +185,7 @@ int dma_supported(struct device *dev, u6SAC 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 >=0xffffffffffULL )) { +if (iommu_sac_force && (mask >=DMA_40BIT_MASK )) {printk (KERN_INFO "%s: Force SAC with mask %Lx\n" , dev->bus_id,mask);return 0 ; }