[PATCH 1/6] swiotlb: remove swiotlb_max_segment

[Tim Gardner]

From: Christoph Hellwig <hch at lst.de>

BugLink: https://bugs.launchpad.net/bugs/2026736

swiotlb_max_segment has always been a bogus API, so remove it now that
the remaining callers are gone.

Signed-off-by: Christoph Hellwig <hch at lst.de>
Reviewed-by: Robin Murphy <robin.murphy at arm.com>
(backported from commit 5e7b9a6ae8c352819a2d998a065910b536de0e8c)
[rtg - context adjustment]
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 include/linux/swiotlb.h |  5 -----
 kernel/dma/swiotlb.c    | 13 -------------
 2 files changed, 18 deletions(-)

diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index bbf4dbfe7d26..d3bc1d49a22d 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -122,7 +122,6 @@ static inline bool is_swiotlb_force_bounce(struct device *dev)
 
 void swiotlb_init(bool addressing_limited, unsigned int flags);
 void __init swiotlb_exit(void);
-unsigned int swiotlb_max_segment(void);
 size_t swiotlb_max_mapping_size(struct device *dev);
 bool is_swiotlb_active(struct device *dev);
 void __init swiotlb_adjust_size(unsigned long size);
@@ -141,10 +140,6 @@ static inline bool is_swiotlb_force_bounce(struct device *dev)
 static inline void swiotlb_exit(void)
 {
 }
-static inline unsigned int swiotlb_max_segment(void)
-{
-	return 0;
-}
 static inline size_t swiotlb_max_mapping_size(struct device *dev)
 {
 	return SIZE_MAX;
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 6610af73f405..cb13374db6a4 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -156,19 +156,6 @@ setup_io_tlb_npages(char *str)
 }
 early_param("swiotlb", setup_io_tlb_npages);
 
-unsigned int swiotlb_max_segment(void)
-{
-	if (!io_tlb_default_mem.nslabs)
-		return 0;
-	return rounddown(io_tlb_default_mem.nslabs << IO_TLB_SHIFT, PAGE_SIZE);
-}
-EXPORT_SYMBOL_GPL(swiotlb_max_segment);
-
-void swiotlb_set_alloc_from_low_pages(bool low)
-{
-	swiotlb_alloc_from_low_pages = low;
-}
-
 unsigned long swiotlb_size_or_default(void)
 {
 	return default_nslabs << IO_TLB_SHIFT;
-- 
2.34.1