aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2008-08-21 11:12:09 -0400
committerIngo Molnar <mingo@elte.hu>2008-08-22 02:43:25 -0400
commit766af9fa812f49feb4a3e62cf92f3d37f33c7fb6 (patch)
treeb175d0664d4d4f798dce2c8e15ac363c459fdc11
parenta38409fbb5181324fb73b359189a72e02b6c7030 (diff)
dma-mapping.h, x86: remove last user of dma_mapping_ops->map_simple
pci-dma.c doesn't use map_simple hook any more so we can remove it from struct dma_mapping_ops now. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/pci-gart_64.c1
-rw-r--r--include/asm-x86/dma-mapping.h3
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index e81df25dc067..cfd7ec25e37e 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -720,7 +720,6 @@ extern int agp_amd64_init(void);
720 720
721static struct dma_mapping_ops gart_dma_ops = { 721static struct dma_mapping_ops gart_dma_ops = {
722 .map_single = gart_map_single, 722 .map_single = gart_map_single,
723 .map_simple = gart_map_simple,
724 .unmap_single = gart_unmap_single, 723 .unmap_single = gart_unmap_single,
725 .sync_single_for_cpu = NULL, 724 .sync_single_for_cpu = NULL,
726 .sync_single_for_device = NULL, 725 .sync_single_for_device = NULL,
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
index 8e16095d1fa9..3a9a6f5e681a 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@ -26,9 +26,6 @@ struct dma_mapping_ops {
26 void *vaddr, dma_addr_t dma_handle); 26 void *vaddr, dma_addr_t dma_handle);
27 dma_addr_t (*map_single)(struct device *hwdev, phys_addr_t ptr, 27 dma_addr_t (*map_single)(struct device *hwdev, phys_addr_t ptr,
28 size_t size, int direction); 28 size_t size, int direction);
29 /* like map_single, but doesn't check the device mask */
30 dma_addr_t (*map_simple)(struct device *hwdev, phys_addr_t ptr,
31 size_t size, int direction);
32 void (*unmap_single)(struct device *dev, dma_addr_t addr, 29 void (*unmap_single)(struct device *dev, dma_addr_t addr,
33 size_t size, int direction); 30 size_t size, int direction);
34 void (*sync_single_for_cpu)(struct device *hwdev, 31 void (*sync_single_for_cpu)(struct device *hwdev,