Nothing uses the old list_head path now, remove it.
Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxx>
---
drivers/iommu/iommu-pages.c | 15 +++------------
drivers/iommu/iommu-pages.h | 8 +-------
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/drivers/iommu/iommu-pages.c b/drivers/iommu/iommu-pages.c
index 92a6966ad4c032..af86c487ba100b 100644
--- a/drivers/iommu/iommu-pages.c
+++ b/drivers/iommu/iommu-pages.c
@@ -67,25 +67,16 @@ void iommu_free_page(void *virt)
EXPORT_SYMBOL_GPL(iommu_free_page);
/**
- * iommu_put_pages_list_new - free a list of pages.
+ * iommu_put_pages_list - free a list of pages.
* @list: The list of pages to be freed
*
* Frees a list of pages allocated by iommu_alloc_pages_node().
*/
-void iommu_put_pages_list_new(struct iommu_pages_list *list)
+void iommu_put_pages_list(struct iommu_pages_list *list)
{
struct page *p, *tmp;
list_for_each_entry_safe(p, tmp, &list->pages, lru)
__iommu_free_page(p);
}
-EXPORT_SYMBOL_GPL(iommu_put_pages_list_new);
-
-void iommu_put_pages_list_old(struct list_head *head)
-{
- struct page *p, *tmp;
-
- list_for_each_entry_safe(p, tmp, head, lru)
- __iommu_free_page(p);
-}
-EXPORT_SYMBOL_GPL(iommu_put_pages_list_old);
+EXPORT_SYMBOL_GPL(iommu_put_pages_list);
diff --git a/drivers/iommu/iommu-pages.h b/drivers/iommu/iommu-pages.h
index 0950f7c0cae9eb..d35d9f99f320dc 100644
--- a/drivers/iommu/iommu-pages.h
+++ b/drivers/iommu/iommu-pages.h
@@ -11,13 +11,7 @@
void *iommu_alloc_pages_node(int nid, gfp_t gfp, unsigned int order);
void iommu_free_page(void *virt);
-void iommu_put_pages_list_new(struct iommu_pages_list *list);
-void iommu_put_pages_list_old(struct list_head *head);
-
-#define iommu_put_pages_list(head) \
- _Generic(head, \
- struct iommu_pages_list *: iommu_put_pages_list_new, \
- struct list_head *: iommu_put_pages_list_old)(head)
+void iommu_put_pages_list(struct iommu_pages_list *list);
/**
* iommu_pages_list_add - add the page to a iommu_pages_list
--
2.43.0
