* [PATCH] Swiotlb: remove a duplicate include
@ 2021-12-22 2:54 ` Guo Zhengkui
0 siblings, 0 replies; 6+ messages in thread
From: Guo Zhengkui @ 2021-12-22 2:54 UTC (permalink / raw)
To: Christoph Hellwig, Marek Szyprowski, Robin Murphy,
open list:SWIOTLB SUBSYSTEM, open list
Cc: kernel, Guo Zhengkui
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 <guozhengkui@vivo.com>
---
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>
#include <asm/dma.h>
#include <linux/io.h>
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] Swiotlb: remove a duplicate include
@ 2021-12-22 2:54 ` Guo Zhengkui
0 siblings, 0 replies; 6+ messages in thread
From: Guo Zhengkui @ 2021-12-22 2:54 UTC (permalink / raw)
To: Christoph Hellwig, Marek Szyprowski, Robin Murphy,
open list:SWIOTLB SUBSYSTEM, open list
Cc: kernel, Guo Zhengkui
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 <guozhengkui@vivo.com>
---
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>
#include <asm/dma.h>
#include <linux/io.h>
--
2.20.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Swiotlb: remove a duplicate include
2021-12-22 2:54 ` Guo Zhengkui
@ 2021-12-22 8:23 ` Christoph Hellwig
-1 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2021-12-22 8:23 UTC (permalink / raw)
To: Guo Zhengkui
Cc: Christoph Hellwig, Marek Szyprowski, Robin Murphy,
open list:SWIOTLB SUBSYSTEM, open list, kernel
On Wed, Dec 22, 2021 at 10:54:16AM +0800, 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.
This doesn't apply to the dma-mapping for-next tree. Also please don't
capitalize the subject line.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Swiotlb: remove a duplicate include
@ 2021-12-22 8:23 ` Christoph Hellwig
0 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2021-12-22 8:23 UTC (permalink / raw)
To: Guo Zhengkui
Cc: open list, Christoph Hellwig, kernel,
open list:SWIOTLB SUBSYSTEM, Robin Murphy
On Wed, Dec 22, 2021 at 10:54:16AM +0800, 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.
This doesn't apply to the dma-mapping for-next tree. Also please don't
capitalize the subject line.
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Swiotlb: remove a duplicate include
2021-12-22 2:54 ` Guo Zhengkui
@ 2021-12-22 10:55 ` Robin Murphy
-1 siblings, 0 replies; 6+ messages in thread
From: Robin Murphy @ 2021-12-22 10:55 UTC (permalink / raw)
To: Guo Zhengkui, Christoph Hellwig, Marek Szyprowski,
open list:SWIOTLB SUBSYSTEM, open list
Cc: kernel
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 <guozhengkui@vivo.com>
> ---
> 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Swiotlb: remove a duplicate include
@ 2021-12-22 10:55 ` Robin Murphy
0 siblings, 0 replies; 6+ messages in thread
From: Robin Murphy @ 2021-12-22 10:55 UTC (permalink / raw)
To: Guo Zhengkui, Christoph Hellwig, Marek Szyprowski,
open list:SWIOTLB SUBSYSTEM, open list
Cc: kernel
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 <guozhengkui@vivo.com>
> ---
> 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
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-12-22 10:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-22 2:54 [PATCH] Swiotlb: remove a duplicate include Guo Zhengkui
2021-12-22 2:54 ` Guo Zhengkui
2021-12-22 8:23 ` Christoph Hellwig
2021-12-22 8:23 ` Christoph Hellwig
2021-12-22 10:55 ` Robin Murphy
2021-12-22 10:55 ` Robin Murphy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.