aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/intel-iommu.c
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2009-01-28 07:53:18 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-29 08:39:29 -0500
commitd7ab5c46ae2743079a40bb4060e510418c0842b4 (patch)
treeda51ca0ad2c50f09ca638bb7bff18ea03b31b106 /drivers/pci/intel-iommu.c
parentdfb805e831cc5306b14eacd64e0b36d0d973ee0d (diff)
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: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/pci/intel-iommu.c')
-rw-r--r--drivers/pci/intel-iommu.c29
1 files changed, 11 insertions, 18 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 59de56304aa6..628f8b72e530 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -2283,13 +2283,6 @@ static dma_addr_t intel_map_page(struct device *dev, struct page *page,
2283 dir, to_pci_dev(dev)->dma_mask); 2283 dir, to_pci_dev(dev)->dma_mask);
2284} 2284}
2285 2285
2286dma_addr_t intel_map_single(struct device *hwdev, phys_addr_t paddr,
2287 size_t size, int dir)
2288{
2289 return __intel_map_single(hwdev, paddr, size, dir,
2290 to_pci_dev(hwdev)->dma_mask);
2291}
2292
2293static void flush_unmaps(void) 2286static void flush_unmaps(void)
2294{ 2287{
2295 int i, j; 2288 int i, j;
@@ -2397,14 +2390,14 @@ static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
2397 } 2390 }
2398} 2391}
2399 2392
2400void intel_unmap_single(struct device *dev, dma_addr_t dev_addr, size_t size, 2393static void intel_unmap_single(struct device *dev, dma_addr_t dev_addr, size_t size,
2401 int dir) 2394 int dir)
2402{ 2395{
2403 intel_unmap_page(dev, dev_addr, size, dir, NULL); 2396 intel_unmap_page(dev, dev_addr, size, dir, NULL);
2404} 2397}
2405 2398
2406void *intel_alloc_coherent(struct device *hwdev, size_t size, 2399static void *intel_alloc_coherent(struct device *hwdev, size_t size,
2407 dma_addr_t *dma_handle, gfp_t flags) 2400 dma_addr_t *dma_handle, gfp_t flags)
2408{ 2401{
2409 void *vaddr; 2402 void *vaddr;
2410 int order; 2403 int order;
@@ -2427,8 +2420,8 @@ void *intel_alloc_coherent(struct device *hwdev, size_t size,
2427 return NULL; 2420 return NULL;
2428} 2421}
2429 2422
2430void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, 2423static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
2431 dma_addr_t dma_handle) 2424 dma_addr_t dma_handle)
2432{ 2425{
2433 int order; 2426 int order;
2434 2427
@@ -2441,9 +2434,9 @@ void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
2441 2434
2442#define SG_ENT_VIRT_ADDRESS(sg) (sg_virt((sg))) 2435#define SG_ENT_VIRT_ADDRESS(sg) (sg_virt((sg)))
2443 2436
2444void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist, 2437static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
2445 int nelems, enum dma_data_direction dir, 2438 int nelems, enum dma_data_direction dir,
2446 struct dma_attrs *attrs) 2439 struct dma_attrs *attrs)
2447{ 2440{
2448 int i; 2441 int i;
2449 struct pci_dev *pdev = to_pci_dev(hwdev); 2442 struct pci_dev *pdev = to_pci_dev(hwdev);
@@ -2500,8 +2493,8 @@ static int intel_nontranslate_map_sg(struct device *hddev,
2500 return nelems; 2493 return nelems;
2501} 2494}
2502 2495
2503int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, 2496static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems,
2504 enum dma_data_direction dir, struct dma_attrs *attrs) 2497 enum dma_data_direction dir, struct dma_attrs *attrs)
2505{ 2498{
2506 void *addr; 2499 void *addr;
2507 int i; 2500 int i;