crypto: ccp - Remove unnecessary includes
Subsystems (2)
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
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
@@ -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
@@ -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
Re: [PATCH 1/2] crypto: ccp - Include DMA declarations explicitly
Quoted 6 lines · Bjorn Helgaas
From: Bjorn Helgaas <[email protected]>
ccp-dev.husesdma_direction, which is defined inlinux/dma-direction.h. Include that explicitly instead of relying on it being included vialinux/pci.h, sinceccp-dev.hrequires nothing else fromlinux/pci.h.
Quoted 8 lines
Similarly,
ccp-dmaengine.cusesdma_get_mask(), which is defined inlinux/dma-mapping.h, so include that explicitly since it requires nothing else fromlinux/pci.h.A future patch will remove the includes of
linux/pci.hwhere it is not needed.Signed-off-by Bjorn Helgaas <[email protected]>
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@@ -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@@ -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>
PATCH 2/2 crypto: ccp - Remove unnecessary linux/pci.h include
In reply to Bjorn HelgaasFrom: 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
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.Signed-off-by Bjorn Helgaas <[email protected]>
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@@ -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@@ -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@@ -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@@ -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@@ -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@@ -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@@ -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>
Herbert Xu
maintainerQuoted 11 lines · Bjorn Helgaas
From: Bjorn Helgaas <[email protected]>
CCP includes <
linux/pci.h> many times unnecessarily. Add a couple DMA-related includes fordma_directionanddma_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 unnecessarylinux/pci.hinclude
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