[PATCH] swiotlb: remove duplicated swiotlb_late_init_with_default_size
declarations
From: FUJITA Tomonori <[email protected]>
Dcc: [email protected]
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
This adds swiotlb_late_init_with_default_size declaration to the
common header so that we can remove duplicated
swiotlb_late_init_with_default_size declarations in the IOMMU drivers.
Signed-off-by: FUJITA Tomonori <[email protected]>
---
arch/ia64/hp/common/hwsw_iommu.c | 3 ---
arch/ia64/hp/common/sba_iommu.c | 3 +--
include/linux/swiotlb.h | 4 ++--
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c
index e4a80d8..d557779 100644
--- a/arch/ia64/hp/common/hwsw_iommu.c
+++ b/arch/ia64/hp/common/hwsw_iommu.c
@@ -19,9 +19,6 @@
extern struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
-/* swiotlb declarations & definitions: */
-extern int swiotlb_late_init_with_default_size (size_t size);
-
/*
* Note: we need to make the determination of whether or not to use
* the sw I/O TLB based purely on the device structure. Anything else
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index 674a837..96c769e 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -37,6 +37,7 @@
#include <linux/crash_dump.h>
#include <linux/iommu-helper.h>
#include <linux/dma-mapping.h>
+#include <linux/swiotlb.h>
#include <asm/delay.h> /* ia64_get_itc() */
#include <asm/io.h>
@@ -46,8 +47,6 @@
#include <asm/acpi-ext.h>
-extern int swiotlb_late_init_with_default_size (size_t size);
-
#define PFX "IOC: "
/*
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 73b1f1c..2583af3 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -20,8 +20,8 @@ struct scatterlist;
*/
#define IO_TLB_SHIFT 11
-extern void
-swiotlb_init(void);
+extern void swiotlb_init(void);
+extern int swiotlb_late_init_with_default_size(size_t size);
extern void
*swiotlb_alloc_coherent(struct device *hwdev, size_t size,
--
1.5.6.5