[PATCH] ia64: remove platform_pci_dma_addres

This removes platform_pci_dma_address.  Since the scatterlist
in 2.5 has a dma_address, seems like we can expect a certain usage
of it.  SGI folks may want to verify this doesn't break their DMA
engines.

diff --git a/arch/ia64/lib/swiotlb.c b/arch/ia64/lib/swiotlb.c
index 52a9df383b227fe01664eebedc808bac4d8dd2de..3d00798be3a689bc19619caf111a5f35298829f4 100644 (file)
--- a/arch/ia64/lib/swiotlb.c
+++ b/arch/ia64/lib/swiotlb.c
@@ -473,12 +473,6 @@ swiotlb_sync_sg (struct pci_dev *hwdev, struct scatterlist *sg, int nelems, int
                        sync_single(hwdev, (void *) sg->dma_address, sg->dma_length, direction);
 }
 
-unsigned long
-swiotlb_dma_address (struct scatterlist *sg)
-{
-       return sg->dma_address;
-}
-
 /*
  * Return whether the given PCI device DMA address mask can be supported properly.  For
  * example, if your device can only drive the low 24-bits during PCI bus mastering, then
@@ -497,7 +491,6 @@ EXPORT_SYMBOL(swiotlb_map_sg);
 EXPORT_SYMBOL(swiotlb_unmap_sg);
 EXPORT_SYMBOL(swiotlb_sync_single);
 EXPORT_SYMBOL(swiotlb_sync_sg);
-EXPORT_SYMBOL(swiotlb_dma_address);
 EXPORT_SYMBOL(swiotlb_alloc_consistent);
 EXPORT_SYMBOL(swiotlb_free_consistent);
 EXPORT_SYMBOL(swiotlb_pci_dma_supported);

diff --git a/include/asm-ia64/machvec.h b/include/asm-ia64/machvec.h
index 8571ed80a34d41e8d974a898ffa0dfaa8bd4c363..31885a2be68ae3e93b20bcd67ff2699907350a1d 100644 (file)
--- a/include/asm-ia64/machvec.h
+++ b/include/asm-ia64/machvec.h
@@ -43,7 +43,6 @@ typedef int ia64_mv_pci_map_sg (struct pci_dev *, struct scatterlist *, int, int
 typedef void ia64_mv_pci_unmap_sg (struct pci_dev *, struct scatterlist *, int, int);
 typedef void ia64_mv_pci_dma_sync_single (struct pci_dev *, dma_addr_t, size_t, int);
 typedef void ia64_mv_pci_dma_sync_sg (struct pci_dev *, struct scatterlist *, int, int);
-typedef unsigned long ia64_mv_pci_dma_address (struct scatterlist *);
 typedef int ia64_mv_pci_dma_supported (struct pci_dev *, u64);
 
 /*
@@ -102,7 +101,6 @@ extern void machvec_noop (void);
 #  define platform_pci_unmap_sg                ia64_mv.unmap_sg
 #  define platform_pci_dma_sync_single ia64_mv.sync_single
 #  define platform_pci_dma_sync_sg     ia64_mv.sync_sg
-#  define platform_pci_dma_address     ia64_mv.dma_address
 #  define platform_pci_dma_supported   ia64_mv.dma_supported
 #  define platform_irq_desc            ia64_mv.irq_desc
 #  define platform_irq_to_vector       ia64_mv.irq_to_vector
@@ -144,7 +142,6 @@ struct ia64_machine_vector {
        ia64_mv_pci_unmap_sg *unmap_sg;
        ia64_mv_pci_dma_sync_single *sync_single;
        ia64_mv_pci_dma_sync_sg *sync_sg;
-       ia64_mv_pci_dma_address *dma_address;
        ia64_mv_pci_dma_supported *dma_supported;
        ia64_mv_irq_desc *irq_desc;
        ia64_mv_irq_to_vector *irq_to_vector;
@@ -182,7 +179,6 @@ struct ia64_machine_vector {
        platform_pci_unmap_sg,                  \
        platform_pci_dma_sync_single,           \
        platform_pci_dma_sync_sg,               \
-       platform_pci_dma_address,               \
        platform_pci_dma_supported,             \
        platform_irq_desc,                      \
        platform_irq_to_vector,                 \
@@ -218,7 +214,6 @@ extern ia64_mv_pci_map_sg swiotlb_map_sg;
 extern ia64_mv_pci_unmap_sg swiotlb_unmap_sg;
 extern ia64_mv_pci_dma_sync_single swiotlb_sync_single;
 extern ia64_mv_pci_dma_sync_sg swiotlb_sync_sg;
-extern ia64_mv_pci_dma_address swiotlb_dma_address;
 extern ia64_mv_pci_dma_supported swiotlb_pci_dma_supported;
 
 /*
@@ -279,9 +274,6 @@ extern ia64_mv_pci_dma_supported swiotlb_pci_dma_supported;
 #ifndef platform_pci_dma_sync_sg
 # define platform_pci_dma_sync_sg      swiotlb_sync_sg
 #endif
-#ifndef platform_pci_dma_address
-# define  platform_pci_dma_address     swiotlb_dma_address
-#endif
 #ifndef platform_pci_dma_supported
 # define  platform_pci_dma_supported   swiotlb_pci_dma_supported
 #endif

diff --git a/include/asm-ia64/machvec_hpzx1.h b/include/asm-ia64/machvec_hpzx1.h
index a3ae277c64472f27150845e4a0bfd46095b22f69..d6a6ef6a388014bffb413bb41b5dfd1a8e2caeb7 100644 (file)
--- a/include/asm-ia64/machvec_hpzx1.h
+++ b/include/asm-ia64/machvec_hpzx1.h
@@ -8,7 +8,6 @@ extern ia64_mv_pci_map_single sba_map_single;
 extern ia64_mv_pci_unmap_single sba_unmap_single;
 extern ia64_mv_pci_map_sg sba_map_sg;
 extern ia64_mv_pci_unmap_sg sba_unmap_sg;
-extern ia64_mv_pci_dma_address sba_dma_address;
 extern ia64_mv_pci_dma_supported sba_dma_supported;
 
 /*
@@ -29,7 +28,6 @@ extern ia64_mv_pci_dma_supported sba_dma_supported;
 #define platform_pci_unmap_sg          sba_unmap_sg
 #define platform_pci_dma_sync_single   ((ia64_mv_pci_dma_sync_single *) machvec_noop)
 #define platform_pci_dma_sync_sg       ((ia64_mv_pci_dma_sync_sg *) machvec_noop)
-#define platform_pci_dma_address       sba_dma_address
 #define platform_pci_dma_supported     sba_dma_supported
 
 #endif /* _ASM_IA64_MACHVEC_HPZX1_h */

diff --git a/include/asm-ia64/machvec_sn1.h b/include/asm-ia64/machvec_sn1.h
index 5f0cb504212755913e5bdd867c1d85f75e3a0af8..354b029bc45a8f4e8cd6d288c8a6fbe6e862d42f 100644 (file)
--- a/include/asm-ia64/machvec_sn1.h
+++ b/include/asm-ia64/machvec_sn1.h
@@ -52,7 +52,6 @@ extern ia64_mv_pci_map_sg             sn1_pci_map_sg;
 extern ia64_mv_pci_unmap_sg            sn1_pci_unmap_sg;
 extern ia64_mv_pci_dma_sync_single     sn1_pci_dma_sync_single;
 extern ia64_mv_pci_dma_sync_sg         sn1_pci_dma_sync_sg;
-extern ia64_mv_pci_dma_address         sn1_dma_address;
 
 /*
  * This stuff has dual use!
@@ -82,6 +81,5 @@ extern ia64_mv_pci_dma_address                sn1_dma_address;
 #define platform_pci_unmap_sg          sn1_pci_unmap_sg
 #define platform_pci_dma_sync_single   sn1_pci_dma_sync_single
 #define platform_pci_dma_sync_sg       sn1_pci_dma_sync_sg
-#define platform_pci_dma_address       sn1_dma_address
 
 #endif /* _ASM_IA64_MACHVEC_SN1_h */

diff --git a/include/asm-ia64/machvec_sn2.h b/include/asm-ia64/machvec_sn2.h
index b867622f3316a1b9c0386046a3ce39317fc26dce..6df35acde37bcb1cfc1cb7038292156843059734 100644 (file)
--- a/include/asm-ia64/machvec_sn2.h
+++ b/include/asm-ia64/machvec_sn2.h
@@ -59,7 +59,6 @@ extern ia64_mv_pci_map_sg             sn_pci_map_sg;
 extern ia64_mv_pci_unmap_sg            sn_pci_unmap_sg;
 extern ia64_mv_pci_dma_sync_single     sn_pci_dma_sync_single;
 extern ia64_mv_pci_dma_sync_sg         sn_pci_dma_sync_sg;
-extern ia64_mv_pci_dma_address         sn_dma_address;
 extern ia64_mv_pci_dma_supported       sn_pci_dma_supported;
 
 /*
@@ -98,7 +97,6 @@ extern ia64_mv_pci_dma_supported      sn_pci_dma_supported;
 #define platform_pci_unmap_sg          sn_pci_unmap_sg
 #define platform_pci_dma_sync_single   sn_pci_dma_sync_single
 #define platform_pci_dma_sync_sg       sn_pci_dma_sync_sg
-#define platform_pci_dma_address       sn_dma_address
 #define platform_pci_dma_supported     sn_pci_dma_supported
 
 #endif /* _ASM_IA64_MACHVEC_SN2_H */