On 2021-12-22 02:54, Guo Zhengkui wrote:
Remove a duplicate "#include <linux/io.h>". The deleted one in line 43
is under "#ifdef CONFIG_DMA_RESTRICTED_POOL". However, there is already
one in line 53 with no conditional compile.
Signed-off-by: Guo Zhengkui <[email protected]>
---
kernel/dma/swiotlb.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 1b0501fd3e0e..8c091626ca35 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -33,21 +33,20 @@
#include <linux/ctype.h>
#include <linux/highmem.h>
#include <linux/gfp.h>
#include <linux/scatterlist.h>
#include <linux/cc_platform.h>
#include <linux/set_memory.h>
#ifdef CONFIG_DEBUG_FS
#include <linux/debugfs.h>
#endif
#ifdef CONFIG_DMA_RESTRICTED_POOL
-#include <linux/io.h>
#include <linux/of.h>
#include <linux/of_fdt.h>
#include <linux/of_reserved_mem.h>
#include <linux/slab.h>
#endif
#include <asm/io.h>
By the same token we don't need this one either - as a general rule,
linux/* headers can be assumed to include their asm/* equivalent, and
that is certainly true for io.h.
#include <asm/dma.h>
#include <linux/io.h>
TBH, now that I'm looking, the whole lot is a mess and I'm sure there's
more legacy cruft that doesn't need to be here. If I remember, I might
have a crack at a cleanup once rc1 is out.
Robin.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
