remove dma operations in struct ia64_machine_vector

We don't need dma operation hooks in struct ia64_machine_vector
now. This also removes unused ia64_mv_dma_* typedefs.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 89 deletions

diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h
index d40722c386b4..6be3010d746a 100644
--- a/arch/ia64/include/asm/machvec.h
+++ b/arch/ia64/include/asm/machvec.h
@@ -45,23 +45,6 @@ typedef void ia64_mv_kernel_launch_event_t(void);
 
 /* DMA-mapping interface: */
 typedef void ia64_mv_dma_init (void);
-typedef void *ia64_mv_dma_alloc_coherent (struct device *, size_t, dma_addr_t *, gfp_t);
-typedef void ia64_mv_dma_free_coherent (struct device *, size_t, void *, dma_addr_t);
-typedef dma_addr_t ia64_mv_dma_map_single (struct device *, void *, size_t, int);
-typedef void ia64_mv_dma_unmap_single (struct device *, dma_addr_t, size_t, int);
-typedef int ia64_mv_dma_map_sg (struct device *, struct scatterlist *, int, int);
-typedef void ia64_mv_dma_unmap_sg (struct device *, struct scatterlist *, int, int);
-typedef void ia64_mv_dma_sync_single_for_cpu (struct device *, dma_addr_t, size_t, int);
-typedef void ia64_mv_dma_sync_sg_for_cpu (struct device *, struct scatterlist *, int, int);
-typedef void ia64_mv_dma_sync_single_for_device (struct device *, dma_addr_t, size_t, int);
-typedef void ia64_mv_dma_sync_sg_for_device (struct device *, struct scatterlist *, int, int);
-typedef int ia64_mv_dma_mapping_error(struct device *, dma_addr_t dma_addr);
-typedef int ia64_mv_dma_supported (struct device *, u64);
-
-typedef dma_addr_t ia64_mv_dma_map_single_attrs (struct device *, void *, size_t, int, struct dma_attrs *);
-typedef void ia64_mv_dma_unmap_single_attrs (struct device *, dma_addr_t, size_t, int, struct dma_attrs *);
-typedef int ia64_mv_dma_map_sg_attrs (struct device *, struct scatterlist *, int, int, struct dma_attrs *);
-typedef void ia64_mv_dma_unmap_sg_attrs (struct device *, struct scatterlist *, int, int, struct dma_attrs *);
 
 /*
  * WARNING: The legacy I/O space is _architected_.  Platforms are
@@ -147,18 +130,6 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *);
 #  define platform_global_tlb_purge     ia64_mv.global_tlb_purge
 #  define platform_tlb_migrate_finish   ia64_mv.tlb_migrate_finish
 #  define platform_dma_init             ia64_mv.dma_init
-#  define platform_dma_alloc_coherent   ia64_mv.dma_alloc_coherent
-#  define platform_dma_free_coherent    ia64_mv.dma_free_coherent
-#  define platform_dma_map_single_attrs ia64_mv.dma_map_single_attrs
-#  define platform_dma_unmap_single_attrs       ia64_mv.dma_unmap_single_attrs
-#  define platform_dma_map_sg_attrs     ia64_mv.dma_map_sg_attrs
-#  define platform_dma_unmap_sg_attrs   ia64_mv.dma_unmap_sg_attrs
-#  define platform_dma_sync_single_for_cpu ia64_mv.dma_sync_single_for_cpu
-#  define platform_dma_sync_sg_for_cpu  ia64_mv.dma_sync_sg_for_cpu
-#  define platform_dma_sync_single_for_device ia64_mv.dma_sync_single_for_device
-#  define platform_dma_sync_sg_for_device ia64_mv.dma_sync_sg_for_device
-#  define platform_dma_mapping_error            ia64_mv.dma_mapping_error
-#  define platform_dma_supported        ia64_mv.dma_supported
 #  define platform_irq_to_vector        ia64_mv.irq_to_vector
 #  define platform_local_vector_to_irq  ia64_mv.local_vector_to_irq
 #  define platform_pci_get_legacy_mem   ia64_mv.pci_get_legacy_mem
@@ -201,18 +172,6 @@ struct ia64_machine_vector {
         ia64_mv_global_tlb_purge_t *global_tlb_purge;
         ia64_mv_tlb_migrate_finish_t *tlb_migrate_finish;
         ia64_mv_dma_init *dma_init;
-        ia64_mv_dma_alloc_coherent *dma_alloc_coherent;
-        ia64_mv_dma_free_coherent *dma_free_coherent;
-        ia64_mv_dma_map_single_attrs *dma_map_single_attrs;
-        ia64_mv_dma_unmap_single_attrs *dma_unmap_single_attrs;
-        ia64_mv_dma_map_sg_attrs *dma_map_sg_attrs;
-        ia64_mv_dma_unmap_sg_attrs *dma_unmap_sg_attrs;
-        ia64_mv_dma_sync_single_for_cpu *dma_sync_single_for_cpu;
-        ia64_mv_dma_sync_sg_for_cpu *dma_sync_sg_for_cpu;
-        ia64_mv_dma_sync_single_for_device *dma_sync_single_for_device;
-        ia64_mv_dma_sync_sg_for_device *dma_sync_sg_for_device;
-        ia64_mv_dma_mapping_error *dma_mapping_error;
-        ia64_mv_dma_supported *dma_supported;
         ia64_mv_irq_to_vector *irq_to_vector;
         ia64_mv_local_vector_to_irq *local_vector_to_irq;
         ia64_mv_pci_get_legacy_mem_t *pci_get_legacy_mem;
@@ -251,18 +210,6 @@ struct ia64_machine_vector {
         platform_global_tlb_purge,              \
         platform_tlb_migrate_finish,            \
         platform_dma_init,                      \
-        platform_dma_alloc_coherent,            \
-        platform_dma_free_coherent,             \
-        platform_dma_map_single_attrs,          \
-        platform_dma_unmap_single_attrs,        \
-        platform_dma_map_sg_attrs,              \
-        platform_dma_unmap_sg_attrs,            \
-        platform_dma_sync_single_for_cpu,       \
-        platform_dma_sync_sg_for_cpu,           \
-        platform_dma_sync_single_for_device,    \
-        platform_dma_sync_sg_for_device,        \
-        platform_dma_mapping_error,                     \
-        platform_dma_supported,                 \
         platform_irq_to_vector,                 \
         platform_local_vector_to_irq,           \
         platform_pci_get_legacy_mem,            \
@@ -332,42 +279,6 @@ extern void swiotlb_dma_init(void);
 #ifndef platform_dma_init
 # define platform_dma_init              swiotlb_dma_init
 #endif
-#ifndef platform_dma_alloc_coherent
-# define platform_dma_alloc_coherent    swiotlb_alloc_coherent
-#endif
-#ifndef platform_dma_free_coherent
-# define platform_dma_free_coherent     swiotlb_free_coherent
-#endif
-#ifndef platform_dma_map_single_attrs
-# define platform_dma_map_single_attrs  swiotlb_map_single_attrs
-#endif
-#ifndef platform_dma_unmap_single_attrs
-# define platform_dma_unmap_single_attrs        swiotlb_unmap_single_attrs
-#endif
-#ifndef platform_dma_map_sg_attrs
-# define platform_dma_map_sg_attrs      swiotlb_map_sg_attrs
-#endif
-#ifndef platform_dma_unmap_sg_attrs
-# define platform_dma_unmap_sg_attrs    swiotlb_unmap_sg_attrs
-#endif
-#ifndef platform_dma_sync_single_for_cpu
-# define platform_dma_sync_single_for_cpu       swiotlb_sync_single_for_cpu
-#endif
-#ifndef platform_dma_sync_sg_for_cpu
-# define platform_dma_sync_sg_for_cpu           swiotlb_sync_sg_for_cpu
-#endif
-#ifndef platform_dma_sync_single_for_device
-# define platform_dma_sync_single_for_device    swiotlb_sync_single_for_device
-#endif
-#ifndef platform_dma_sync_sg_for_device
-# define platform_dma_sync_sg_for_device        swiotlb_sync_sg_for_device
-#endif
-#ifndef platform_dma_mapping_error
-# define platform_dma_mapping_error             swiotlb_dma_mapping_error
-#endif
-#ifndef platform_dma_supported
-# define  platform_dma_supported        swiotlb_dma_supported
-#endif
 #ifndef platform_irq_to_vector
 # define platform_irq_to_vector         __ia64_irq_to_vector
 #endif