Skip to content

Commit c0a4191

Browse files
rmurphy-armChristoph Hellwig
authored andcommitted
swiotlb: tidy up includes
SWIOTLB's includes have become a great big mess. Restore some order by consolidating the random different blocks, sorting alphabetically, and purging some clearly unnecessary entries - linux/io.h is now included unconditionally, so need not be duplicated in the restricted DMA pool case; similarly, linux/io.h subsumes asm/io.h; and by now it's a mystery why asm/dma.h was ever here at all. Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
1 parent 3526589 commit c0a4191

1 file changed

Lines changed: 13 additions & 18 deletions

File tree

kernel/dma/swiotlb.c

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,38 +21,33 @@
2121
#define pr_fmt(fmt) "software IO TLB: " fmt
2222

2323
#include <linux/cache.h>
24+
#include <linux/cc_platform.h>
25+
#include <linux/ctype.h>
26+
#include <linux/debugfs.h>
2427
#include <linux/dma-direct.h>
2528
#include <linux/dma-map-ops.h>
26-
#include <linux/mm.h>
2729
#include <linux/export.h>
30+
#include <linux/gfp.h>
31+
#include <linux/highmem.h>
32+
#include <linux/io.h>
33+
#include <linux/iommu-helper.h>
34+
#include <linux/init.h>
35+
#include <linux/memblock.h>
36+
#include <linux/mm.h>
37+
#include <linux/pfn.h>
38+
#include <linux/scatterlist.h>
39+
#include <linux/set_memory.h>
2840
#include <linux/spinlock.h>
2941
#include <linux/string.h>
3042
#include <linux/swiotlb.h>
31-
#include <linux/pfn.h>
3243
#include <linux/types.h>
33-
#include <linux/ctype.h>
34-
#include <linux/highmem.h>
35-
#include <linux/gfp.h>
36-
#include <linux/scatterlist.h>
37-
#include <linux/cc_platform.h>
38-
#include <linux/set_memory.h>
39-
#include <linux/debugfs.h>
4044
#ifdef CONFIG_DMA_RESTRICTED_POOL
41-
#include <linux/io.h>
4245
#include <linux/of.h>
4346
#include <linux/of_fdt.h>
4447
#include <linux/of_reserved_mem.h>
4548
#include <linux/slab.h>
4649
#endif
4750

48-
#include <asm/io.h>
49-
#include <asm/dma.h>
50-
51-
#include <linux/io.h>
52-
#include <linux/init.h>
53-
#include <linux/memblock.h>
54-
#include <linux/iommu-helper.h>
55-
5651
#define CREATE_TRACE_POINTS
5752
#include <trace/events/swiotlb.h>
5853

0 commit comments

Comments
 (0)