Skip to contentSkip to conversation

crypto: ccp - Remove unnecessary includes

PATCH In review Bjorn Helgaas 3 participants 6 messages Aug 2, 2019 – Aug 9, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover crypto: ccp - Remove unnecessary includes

From: Bjorn Helgaas <[email protected]>

CCP includes <linux/pci.h> many times unnecessarily. Add a couple DMA-related includes for dma_direction and dma_get_mask(), which were previously included indirectly via <linux/pci.h>. Then remove the unnecessary includes of <linux/pci.h>.

Bjorn Helgaas (2):
crypto: ccp - Include DMA declarations explicitly
crypto: ccp - Remove unnecessary linux/pci.h include

 drivers/crypto/ccp/ccp-crypto.h    | 1 -
 drivers/crypto/ccp/ccp-dev-v3.c    | 1 -
 drivers/crypto/ccp/ccp-dev-v5.c    | 1 -
 drivers/crypto/ccp/ccp-dev.h       | 2 +-
 drivers/crypto/ccp/ccp-dmaengine.c | 1 +
 drivers/crypto/ccp/ccp-ops.c       | 1 -
 drivers/crypto/ccp/psp-dev.h       | 1 -
 drivers/crypto/ccp/sp-dev.h        | 1 -
 8 files changed, 2 insertions(+), 7 deletions(-)
Signature · 1 line
2.22.0.770.g0f2c4a37fd-goog
#1 lore raw

PATCH 1/2 crypto: ccp - Include DMA declarations explicitly

From: Bjorn Helgaas <[email protected]>

ccp-dev.h uses dma_direction, which is defined in linux/dma-direction.h. Include that explicitly instead of relying on it being included via linux/pci.h, since ccp-dev.h requires nothing else from linux/pci.h.

Similarly, ccp-dmaengine.c uses dma_get_mask(), which is defined in linux/dma-mapping.h, so include that explicitly since it requires nothing else from linux/pci.h.

A future patch will remove the includes of linux/pci.h where it is not needed.

---
 drivers/crypto/ccp/ccp-dev.h       | 1 +
 drivers/crypto/ccp/ccp-dmaengine.c | 1 +
 2 files changed, 2 insertions(+)
drivers/crypto/ccp/ccp-dev.h +1 -0
index 5e624920fd99..89aee0900a06 100644
@@ -17,6 +17,7 @@
 #include <linux/mutex.h>
 #include <linux/list.h>
 #include <linux/wait.h>
+#include <linux/dma-direction.h>
 #include <linux/dmapool.h>
 #include <linux/hw_random.h>
 #include <linux/bitops.h>
drivers/crypto/ccp/ccp-dmaengine.c +1 -0
index 7f22a45bbc11..f69d495873f0 100644
@@ -9,6 +9,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
Signature · 1 line
2.22.0.770.g0f2c4a37fd-goog
Acked-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] crypto: ccp - Include DMA declarations explicitly

Quoted 6 lines · Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

ccp-dev.h uses dma_direction, which is defined in linux/dma-direction.h. Include that explicitly instead of relying on it being included via linux/pci.h, since ccp-dev.h requires nothing else from linux/pci.h.

Quoted 8 lines

Similarly, ccp-dmaengine.c uses dma_get_mask(), which is defined in linux/dma-mapping.h, so include that explicitly since it requires nothing else from linux/pci.h.

A future patch will remove the includes of linux/pci.h where it is not needed.

Quoted 30 lines
---
  drivers/crypto/ccp/ccp-dev.h       | 1 +
  drivers/crypto/ccp/ccp-dmaengine.c | 1 +
  2 files changed, 2 insertions(+)
drivers/crypto/ccp/ccp-dev.h +1 -0
index 5e624920fd99..89aee0900a06 100644
@@ -17,6 +17,7 @@
  #include <linux/mutex.h>
  #include <linux/list.h>
  #include <linux/wait.h>
+#include <linux/dma-direction.h>
  #include <linux/dmapool.h>
  #include <linux/hw_random.h>
  #include <linux/bitops.h>
drivers/crypto/ccp/ccp-dmaengine.c +1 -0
index 7f22a45bbc11..f69d495873f0 100644
@@ -9,6 +9,7 @@
 
  #include <linux/module.h>
  #include <linux/kernel.h>
+#include <linux/dma-mapping.h>
  #include <linux/dmaengine.h>
  #include <linux/spinlock.h>
  #include <linux/mutex.h>
#3 lore raw

PATCH 2/2 crypto: ccp - Remove unnecessary linux/pci.h include

In reply to Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

Remove unused includes of linux/pci.h.

---
 drivers/crypto/ccp/ccp-crypto.h | 1 -
 drivers/crypto/ccp/ccp-dev-v3.c | 1 -
 drivers/crypto/ccp/ccp-dev-v5.c | 1 -
 drivers/crypto/ccp/ccp-dev.h    | 1 -
 drivers/crypto/ccp/ccp-ops.c    | 1 -
 drivers/crypto/ccp/psp-dev.h    | 1 -
 drivers/crypto/ccp/sp-dev.h     | 1 -
 7 files changed, 7 deletions(-)
drivers/crypto/ccp/ccp-crypto.h +0 -1
index 622b34c17643..903e74e7ad1b 100644
@@ -12,7 +12,6 @@
 
 #include <linux/list.h>
 #include <linux/wait.h>
-#include <linux/pci.h>
 #include <linux/ccp.h>
 #include <crypto/algapi.h>
 #include <crypto/aes.h>
drivers/crypto/ccp/ccp-dev-v3.c +0 -1
index 2b7d47ed5c74..09924f2c264f 100644
@@ -10,7 +10,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/pci.h>
 #include <linux/kthread.h>
 #include <linux/interrupt.h>
 #include <linux/ccp.h>
drivers/crypto/ccp/ccp-dev-v5.c +0 -1
index 217e41bbadaf..0b6ef334f9b7 100644
@@ -9,7 +9,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/pci.h>
 #include <linux/kthread.h>
 #include <linux/debugfs.h>
 #include <linux/dma-mapping.h>
drivers/crypto/ccp/ccp-dev.h +0 -1
index 89aee0900a06..57749c5a5373 100644
@@ -12,7 +12,6 @@
 #define __CCP_DEV_H__
 
 #include <linux/device.h>
-#include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/list.h>
drivers/crypto/ccp/ccp-ops.c +0 -1
index c69ed4bae2eb..b565c08bbe28 100644
@@ -10,7 +10,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <crypto/scatterwalk.h>
 #include <crypto/des.h>
drivers/crypto/ccp/psp-dev.h +0 -1
index c5e06c92d40e..82a084f02990 100644
@@ -11,7 +11,6 @@
 #define __PSP_DEV_H__
 
 #include <linux/device.h>
-#include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/list.h>
drivers/crypto/ccp/sp-dev.h +0 -1
index 8abe9ea7e76f..53c12562d31e 100644
@@ -13,7 +13,6 @@
 #define __SP_DEV_H__
 
 #include <linux/device.h>
-#include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/list.h>
Signature · 1 line
2.22.0.770.g0f2c4a37fd-goog
Acked-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] crypto: ccp - Remove unnecessary linux/pci.h include

Quoted 5 lines · Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

Remove unused includes of linux/pci.h.

Quoted 95 lines
---
  drivers/crypto/ccp/ccp-crypto.h | 1 -
  drivers/crypto/ccp/ccp-dev-v3.c | 1 -
  drivers/crypto/ccp/ccp-dev-v5.c | 1 -
  drivers/crypto/ccp/ccp-dev.h    | 1 -
  drivers/crypto/ccp/ccp-ops.c    | 1 -
  drivers/crypto/ccp/psp-dev.h    | 1 -
  drivers/crypto/ccp/sp-dev.h     | 1 -
  7 files changed, 7 deletions(-)
drivers/crypto/ccp/ccp-crypto.h +0 -1
index 622b34c17643..903e74e7ad1b 100644
@@ -12,7 +12,6 @@
 
  #include <linux/list.h>
  #include <linux/wait.h>
-#include <linux/pci.h>
  #include <linux/ccp.h>
  #include <crypto/algapi.h>
  #include <crypto/aes.h>
drivers/crypto/ccp/ccp-dev-v3.c +0 -1
index 2b7d47ed5c74..09924f2c264f 100644
@@ -10,7 +10,6 @@
 
  #include <linux/module.h>
  #include <linux/kernel.h>
-#include <linux/pci.h>
  #include <linux/kthread.h>
  #include <linux/interrupt.h>
  #include <linux/ccp.h>
drivers/crypto/ccp/ccp-dev-v5.c +0 -1
index 217e41bbadaf..0b6ef334f9b7 100644
@@ -9,7 +9,6 @@
 
  #include <linux/module.h>
  #include <linux/kernel.h>
-#include <linux/pci.h>
  #include <linux/kthread.h>
  #include <linux/debugfs.h>
  #include <linux/dma-mapping.h>
drivers/crypto/ccp/ccp-dev.h +0 -1
index 89aee0900a06..57749c5a5373 100644
@@ -12,7 +12,6 @@
  #define __CCP_DEV_H__
 
  #include <linux/device.h>
-#include <linux/pci.h>
  #include <linux/spinlock.h>
  #include <linux/mutex.h>
  #include <linux/list.h>
drivers/crypto/ccp/ccp-ops.c +0 -1
index c69ed4bae2eb..b565c08bbe28 100644
@@ -10,7 +10,6 @@
 
  #include <linux/module.h>
  #include <linux/kernel.h>
-#include <linux/pci.h>
  #include <linux/interrupt.h>
  #include <crypto/scatterwalk.h>
  #include <crypto/des.h>
drivers/crypto/ccp/psp-dev.h +0 -1
index c5e06c92d40e..82a084f02990 100644
@@ -11,7 +11,6 @@
  #define __PSP_DEV_H__
 
  #include <linux/device.h>
-#include <linux/pci.h>
  #include <linux/spinlock.h>
  #include <linux/mutex.h>
  #include <linux/list.h>
drivers/crypto/ccp/sp-dev.h +0 -1
index 8abe9ea7e76f..53c12562d31e 100644
@@ -13,7 +13,6 @@
  #define __SP_DEV_H__
 
  #include <linux/device.h>
-#include <linux/pci.h>
  #include <linux/spinlock.h>
  #include <linux/mutex.h>
  #include <linux/list.h>
maintainer
#5 lore raw
In reply to Bjorn Helgaas
Quoted 11 lines · Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

CCP includes <linux/pci.h> many times unnecessarily. Add a couple DMA-related includes for dma_direction and dma_get_mask(), which were previously included indirectly via <linux/pci.h>. Then remove the unnecessary includes of <linux/pci.h>.

Bjorn Helgaas (2):
crypto: ccp - Include DMA declarations explicitly
crypto: ccp - Remove unnecessary linux/pci.h include

Quoted 9 lines
 drivers/crypto/ccp/ccp-crypto.h    | 1 -
 drivers/crypto/ccp/ccp-dev-v3.c    | 1 -
 drivers/crypto/ccp/ccp-dev-v5.c    | 1 -
 drivers/crypto/ccp/ccp-dev.h       | 2 +-
 drivers/crypto/ccp/ccp-dmaengine.c | 1 +
 drivers/crypto/ccp/ccp-ops.c       | 1 -
 drivers/crypto/ccp/psp-dev.h       | 1 -
 drivers/crypto/ccp/sp-dev.h        | 1 -
 8 files changed, 2 insertions(+), 7 deletions(-)

All applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt