Re: [PATCH] Swiotlb: remove a duplicate include

2021-12-22 Thread Robin Murphy

On 2021-12-22 02:54, Guo Zhengkui wrote:

Remove a duplicate "#include ". 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 
---
  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 
  #include 
  #include 
  #include 
  #include 
  #include 
  #ifdef CONFIG_DEBUG_FS
  #include 
  #endif
  #ifdef CONFIG_DMA_RESTRICTED_POOL
-#include 
  #include 
  #include 
  #include 
  #include 
  #endif
  
  #include 


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 
  
  #include 


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


Re: [PATCH] Swiotlb: remove a duplicate include

2021-12-22 Thread Christoph Hellwig
On Wed, Dec 22, 2021 at 10:54:16AM +0800, Guo Zhengkui wrote:
> Remove a duplicate "#include ". 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


[PATCH] Swiotlb: remove a duplicate include

2021-12-21 Thread Guo Zhengkui
Remove a duplicate "#include ". 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 
---
 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 
 #include 
 #include 
 #include 
 #include 
 #include 
 #ifdef CONFIG_DEBUG_FS
 #include 
 #endif
 #ifdef CONFIG_DMA_RESTRICTED_POOL
-#include 
 #include 
 #include 
 #include 
 #include 
 #endif
 
 #include 
 #include 
 
 #include 
-- 
2.20.1

___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu