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

Commit d7ab5c46 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Ingo Molnar
Browse files

intel-iommu: make dma mapping functions static 



The dma ops unification enables X86 and IA64 to share intel_dma_ops so
we can make dma mapping functions static. This also remove unused
intel_map_single().

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent dfb805e8

drivers/pci/intel-iommu.c

+11 −18
Original line number Diff line number Diff line
@@ -2283,13 +2283,6 @@ static dma_addr_t intel_map_page(struct device *dev, struct page *page, 
				  dir, to_pci_dev(dev)->dma_mask);

}



dma_addr_t intel_map_single(struct device *hwdev, phys_addr_t paddr,

			    size_t size, int dir)

{

	return __intel_map_single(hwdev, paddr, size, dir,

				  to_pci_dev(hwdev)->dma_mask);

}



static void flush_unmaps(void)

{

	int i, j;
@@ -2397,13 +2390,13 @@ static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, 
	}

}



void intel_unmap_single(struct device *dev, dma_addr_t dev_addr, size_t size,

static void intel_unmap_single(struct device *dev, dma_addr_t dev_addr, size_t size,

			       int dir)

{

	intel_unmap_page(dev, dev_addr, size, dir, NULL);

}



void *intel_alloc_coherent(struct device *hwdev, size_t size,

static void *intel_alloc_coherent(struct device *hwdev, size_t size,

				  dma_addr_t *dma_handle, gfp_t flags)

{

	void *vaddr;
@@ -2427,7 +2420,7 @@ void *intel_alloc_coherent(struct device *hwdev, size_t size, 
	return NULL;

}



void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,

static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,

				dma_addr_t dma_handle)

{

	int order;
@@ -2441,7 +2434,7 @@ void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, 


#define SG_ENT_VIRT_ADDRESS(sg)	(sg_virt((sg)))



void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,

static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,

			   int nelems, enum dma_data_direction dir,

			   struct dma_attrs *attrs)

{
@@ -2500,7 +2493,7 @@ static int intel_nontranslate_map_sg(struct device *hddev, 
	return nelems;

}



int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems,

static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems,

			enum dma_data_direction dir, struct dma_attrs *attrs)

{

	void *addr;

include/linux/intel-iommu.h

+0 −9
Original line number Diff line number Diff line
@@ -330,13 +330,4 @@ extern int qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr, 


extern void qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);



extern void *intel_alloc_coherent(struct device *, size_t, dma_addr_t *, gfp_t);

extern void intel_free_coherent(struct device *, size_t, void *, dma_addr_t);

extern dma_addr_t intel_map_single(struct device *, phys_addr_t, size_t, int);

extern void intel_unmap_single(struct device *, dma_addr_t, size_t, int);

extern int intel_map_sg(struct device *, struct scatterlist *, int,

			enum dma_data_direction, struct dma_attrs *);

extern void intel_unmap_sg(struct device *, struct scatterlist *, int,

			   enum dma_data_direction, struct dma_attrs *);



#endif