parisc: move internal implementation details out of <asm/dma-mapping.h>

Move everything that is not required for the public facing DMA API out
of <asm/dma-mapping.h> and into a new drivers/parisc/iommu.h header.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/arch/parisc/include/asm/dma-mapping.h b/arch/parisc/include/asm/dma-mapping.h
index f1bf5e2..d5bd942 100644 (file)
--- a/arch/parisc/include/asm/dma-mapping.h
+++ b/arch/parisc/include/asm/dma-mapping.h
@@ -26,48 +26,4 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
        return hppa_dma_ops;
 }
 
-static inline void *
-parisc_walk_tree(struct device *dev)
-{
-       struct device *otherdev;
-       if(likely(dev->platform_data != NULL))
-               return dev->platform_data;
-       /* OK, just traverse the bus to find it */
-       for(otherdev = dev->parent; otherdev;
-           otherdev = otherdev->parent) {
-               if(otherdev->platform_data) {
-                       dev->platform_data = otherdev->platform_data;
-                       break;
-               }
-       }
-       return dev->platform_data;
-}
-
-#define GET_IOC(dev) ({                                        \
-       void *__pdata = parisc_walk_tree(dev);          \
-       __pdata ? HBA_DATA(__pdata)->iommu : NULL;      \
-})
-
-#ifdef CONFIG_IOMMU_CCIO
-struct parisc_device;
-struct ioc;
-void * ccio_get_iommu(const struct parisc_device *dev);
-int ccio_request_resource(const struct parisc_device *dev,
-               struct resource *res);
-int ccio_allocate_resource(const struct parisc_device *dev,
-               struct resource *res, unsigned long size,
-               unsigned long min, unsigned long max, unsigned long align);
-#else /* !CONFIG_IOMMU_CCIO */
-#define ccio_get_iommu(dev) NULL
-#define ccio_request_resource(dev, res) insert_resource(&iomem_resource, res)
-#define ccio_allocate_resource(dev, res, size, min, max, align) \
-               allocate_resource(&iomem_resource, res, size, min, max, \
-                               align, NULL, NULL)
-#endif /* !CONFIG_IOMMU_CCIO */
-
-#ifdef CONFIG_IOMMU_SBA
-struct parisc_device;
-void * sba_get_iommu(struct parisc_device *dev);
-#endif
-
 #endif

diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 8d2fc84..b17e81c 100644 (file)
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -55,6 +55,8 @@
 #include <asm/hardware.h>       /* for register_module() */
 #include <asm/parisc-device.h>
 
+#include "iommu.h"
+
 /* 
 ** Choose "ccio" since that's what HP-UX calls it.
 ** Make it easier for folks to migrate from one to the other :^)

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index dfeea45..6f348c7 100644 (file)
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -59,6 +59,7 @@
 #include <asm/hardware.h>
 
 #include "gsc.h"
+#include "iommu.h"
 
 #undef DINO_DEBUG
 

diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index 9ff434f..5657a1d 100644 (file)
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -45,6 +45,8 @@
 #include <asm/eisa_bus.h>
 #include <asm/eisa_eeprom.h>
 
+#include "iommu.h"
+
 #if 0
 #define EISA_DBG(msg, arg...) printk(KERN_DEBUG "eisa: " msg, ## arg)
 #else

diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c
index ebc7b61..3b3481c 100644 (file)
--- a/drivers/parisc/hppb.c
+++ b/drivers/parisc/hppb.c
@@ -23,6 +23,8 @@
 #include <asm/hardware.h>
 #include <asm/parisc-device.h>
 
+#include "iommu.h"
+
 struct hppb_card {
        unsigned long hpa;
        struct resource mmio_region;

diff --git a/drivers/parisc/iommu.h b/drivers/parisc/iommu.h
new file mode 100644 (file)
index 0000000..5a38b63
--- /dev/null
+++ b/drivers/parisc/iommu.h
@@ -0,0 +1,51 @@
+#ifndef _IOMMU_H
+#define _IOMMU_H 1
+
+#include <linux/pci.h>
+
+struct parisc_device;
+struct ioc;
+
+static inline void *parisc_walk_tree(struct device *dev)
+{
+       struct device *otherdev;
+
+       if (likely(dev->platform_data))
+               return dev->platform_data;
+
+       /* OK, just traverse the bus to find it */
+       for (otherdev = dev->parent;
+            otherdev;
+            otherdev = otherdev->parent) {
+               if (otherdev->platform_data) {
+                       dev->platform_data = otherdev->platform_data;
+                       break;
+               }
+       }
+
+       return dev->platform_data;
+}
+
+#define GET_IOC(dev) ({                                        \
+       void *__pdata = parisc_walk_tree(dev);          \
+       __pdata ? HBA_DATA(__pdata)->iommu : NULL;      \
+})
+
+#ifdef CONFIG_IOMMU_CCIO
+void *ccio_get_iommu(const struct parisc_device *dev);
+int ccio_request_resource(const struct parisc_device *dev,
+               struct resource *res);
+int ccio_allocate_resource(const struct parisc_device *dev,
+               struct resource *res, unsigned long size,
+               unsigned long min, unsigned long max, unsigned long align);
+#else /* !CONFIG_IOMMU_CCIO */
+#define ccio_get_iommu(dev) NULL
+#define ccio_request_resource(dev, res) insert_resource(&iomem_resource, res)
+#define ccio_allocate_resource(dev, res, size, min, max, align) \
+               allocate_resource(&iomem_resource, res, size, min, max, \
+                               align, NULL, NULL)
+#endif /* !CONFIG_IOMMU_CCIO */
+
+void *sba_get_iommu(struct parisc_device *dev);
+
+#endif /* _IOMMU_H */

diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index d376201..dcea155 100644 (file)
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -49,6 +49,8 @@
 #include <asm/parisc-device.h>
 #include <asm/io.h>            /* read/write stuff */
 
+#include "iommu.h"
+
 #undef DEBUG_LBA       /* general stuff */
 #undef DEBUG_LBA_PORT  /* debug I/O Port access */
 #undef DEBUG_LBA_CFG   /* debug Config Space Access (ie PCI Bus walk) */

diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 42172eb..afaf8e6 100644 (file)
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -49,6 +49,8 @@
 #include <asm/pdcpat.h>                /* for is_pdc_pat() */
 #include <asm/parisc-device.h>
 
+#include "iommu.h"
+
 #define MODULE_NAME "SBA"
 
 /*