[PATCH v4 5/7] powerpc/iommu: Move iommu_table cleaning routine to iommu_table_clean

[Leonardo Bras]

Move the part of iommu_table_free() that does struct iommu_table cleaning
into iommu_table_clean, so we can invoke it separately.

This new function is useful for cleaning struct iommu_table before
initializing it again with a new DMA window, without having it freed and
allocated again.

Signed-off-by: Leonardo Bras <leobra...@gmail.com>
---
 arch/powerpc/kernel/iommu.c | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index 9704f3f76e63..c3242253a4e7 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -735,21 +735,10 @@ struct iommu_table *iommu_init_table(struct iommu_table 
*tbl, int nid,
        return tbl;
 }
 
-static void iommu_table_free(struct kref *kref)
+static void iommu_table_clean(struct iommu_table *tbl)
 {
        unsigned long bitmap_sz;
        unsigned int order;
-       struct iommu_table *tbl;
-
-       tbl = container_of(kref, struct iommu_table, it_kref);
-
-       if (tbl->it_ops->free)
-               tbl->it_ops->free(tbl);
-
-       if (!tbl->it_map) {
-               kfree(tbl);
-               return;
-       }
 
        iommu_table_release_pages(tbl);
 
@@ -763,6 +752,23 @@ static void iommu_table_free(struct kref *kref)
        /* free bitmap */
        order = get_order(bitmap_sz);
        free_pages((unsigned long) tbl->it_map, order);
+}
+
+static void iommu_table_free(struct kref *kref)
+{
+       struct iommu_table *tbl;
+
+       tbl = container_of(kref, struct iommu_table, it_kref);
+
+       if (tbl->it_ops->free)
+               tbl->it_ops->free(tbl);
+
+       if (!tbl->it_map) {
+               kfree(tbl);
+               return;
+       }
+
+       iommu_table_clean(tbl);
 
        /* free table */
        kfree(tbl);
-- 
2.25.4