swiotlb: rename swiotlb_free to swiotlb_exit

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c
index 506ac4fafac5431e297cc0965439afc72b77f569..88f3963ca30f685aead454338a2467a223dbc6ae 100644 (file)
--- a/arch/powerpc/kernel/dma-swiotlb.c
+++ b/arch/powerpc/kernel/dma-swiotlb.c
@@ -121,7 +121,7 @@ static int __init check_swiotlb_enabled(void)
        if (ppc_swiotlb_enable)
                swiotlb_print_info();
        else
-               swiotlb_free();
+               swiotlb_exit();
 
        return 0;
 }

diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index 0d77603c2f505e58d0886323677af374e30abab6..0ee0f8f342513d08dda72c6aee9e11123c0c7aa8 100644 (file)
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@ -120,7 +120,7 @@ void __init pci_swiotlb_late_init(void)
 {
        /* An IOMMU turned us off. */
        if (!swiotlb)
-               swiotlb_free();
+               swiotlb_exit();
        else {
                printk(KERN_INFO "PCI-DMA: "
                       "Using software bounce buffering for IO (SWIOTLB)\n");

diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index 24ed817082ee590d96a18f4fbf76e289ed439ab5..606375e35d87ff21930a78363ea2b3600e2f1376 100644 (file)
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -115,10 +115,10 @@ extern int
 swiotlb_dma_supported(struct device *hwdev, u64 mask);
 
 #ifdef CONFIG_SWIOTLB
-extern void __init swiotlb_free(void);
+extern void __init swiotlb_exit(void);
 unsigned int swiotlb_max_segment(void);
 #else
-static inline void swiotlb_free(void) { }
+static inline void swiotlb_exit(void) { }
 static inline unsigned int swiotlb_max_segment(void) { return 0; }
 #endif
 

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 125c1062119fa309917fc6d6fc12eef49601dc1d..cf5311908fa9481b62e400445ba0dbc4e67c8484 100644 (file)
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -417,7 +417,7 @@ cleanup2:
        return -ENOMEM;
 }
 
-void __init swiotlb_free(void)
+void __init swiotlb_exit(void)
 {
        if (!io_tlb_orig_addr)
                return;