diff options
author | Gilad Ben-Yossef <gilad@benyossef.com> | 2018-01-09 10:24:29 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-09 16:00:07 +0100 |
commit | e7660d2d4714a146a80553e9355b40c467d60183 (patch) | |
tree | 2f1ebf583b0b49ff3b1ac6694c609664a0d682b5 | |
parent | 5b135f6b50effb88b1e7bc44d18800a16e222941 (diff) | |
download | linux-e7660d2d4714a146a80553e9355b40c467d60183.tar.bz2 |
staging: ccree: use a consistent file naming convention
The ccree driver source files were using an inconsistent
naming convention stemming from what the company was called
when they were added.
Move to a single consistent naming convention for better
code readability.
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/ccree/Makefile | 6 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_aead.c (renamed from drivers/staging/ccree/ssi_aead.c) | 12 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_aead.h (renamed from drivers/staging/ccree/ssi_aead.h) | 2 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_buffer_mgr.c (renamed from drivers/staging/ccree/ssi_buffer_mgr.c) | 8 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_buffer_mgr.h (renamed from drivers/staging/ccree/ssi_buffer_mgr.h) | 4 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_cipher.c (renamed from drivers/staging/ccree/ssi_cipher.c) | 8 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_cipher.h (renamed from drivers/staging/ccree/ssi_cipher.h) | 6 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_debugfs.c | 2 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_driver.c (renamed from drivers/staging/ccree/ssi_driver.c) | 20 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_driver.h (renamed from drivers/staging/ccree/ssi_driver.h) | 6 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_fips.c (renamed from drivers/staging/ccree/ssi_fips.c) | 4 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_fips.h (renamed from drivers/staging/ccree/ssi_fips.h) | 0 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_hash.c (renamed from drivers/staging/ccree/ssi_hash.c) | 10 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_hash.h (renamed from drivers/staging/ccree/ssi_hash.h) | 4 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_host_regs.h (renamed from drivers/staging/ccree/dx_host.h) | 0 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_hw_queue_defs.h | 2 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_ivgen.c (renamed from drivers/staging/ccree/ssi_ivgen.c) | 10 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_ivgen.h (renamed from drivers/staging/ccree/ssi_ivgen.h) | 0 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_kernel_regs.h (renamed from drivers/staging/ccree/dx_crys_kernel.h) | 0 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_pm.c (renamed from drivers/staging/ccree/ssi_pm.c) | 14 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_pm.h (renamed from drivers/staging/ccree/ssi_pm.h) | 4 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_request_mgr.c (renamed from drivers/staging/ccree/ssi_request_mgr.c) | 10 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_request_mgr.h (renamed from drivers/staging/ccree/ssi_request_mgr.h) | 2 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_sram_mgr.c (renamed from drivers/staging/ccree/ssi_sram_mgr.c) | 4 | ||||
-rw-r--r-- | drivers/staging/ccree/cc_sram_mgr.h (renamed from drivers/staging/ccree/ssi_sram_mgr.h) | 0 |
25 files changed, 69 insertions, 69 deletions
diff --git a/drivers/staging/ccree/Makefile b/drivers/staging/ccree/Makefile index c107e2506717..bdc27970f95f 100644 --- a/drivers/staging/ccree/Makefile +++ b/drivers/staging/ccree/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_CRYPTO_DEV_CCREE) := ccree.o -ccree-y := ssi_driver.o ssi_buffer_mgr.o ssi_request_mgr.o ssi_cipher.o ssi_hash.o ssi_aead.o ssi_ivgen.o ssi_sram_mgr.o -ccree-$(CONFIG_CRYPTO_FIPS) += ssi_fips.o +ccree-y := cc_driver.o cc_buffer_mgr.o cc_request_mgr.o cc_cipher.o cc_hash.o cc_aead.o cc_ivgen.o cc_sram_mgr.o +ccree-$(CONFIG_CRYPTO_FIPS) += cc_fips.o ccree-$(CONFIG_DEBUG_FS) += cc_debugfs.o -ccree-$(CONFIG_PM) += ssi_pm.o +ccree-$(CONFIG_PM) += cc_pm.o diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/cc_aead.c index 6f41a004ae9a..da7442347f94 100644 --- a/drivers/staging/ccree/ssi_aead.c +++ b/drivers/staging/ccree/cc_aead.c @@ -15,12 +15,12 @@ #include <crypto/des.h> #include <linux/rtnetlink.h> #include <linux/version.h> -#include "ssi_driver.h" -#include "ssi_buffer_mgr.h" -#include "ssi_aead.h" -#include "ssi_request_mgr.h" -#include "ssi_hash.h" -#include "ssi_sram_mgr.h" +#include "cc_driver.h" +#include "cc_buffer_mgr.h" +#include "cc_aead.h" +#include "cc_request_mgr.h" +#include "cc_hash.h" +#include "cc_sram_mgr.h" #define template_aead template_u.aead diff --git a/drivers/staging/ccree/ssi_aead.h b/drivers/staging/ccree/cc_aead.h index 9567b8f9f142..5edf3b351fa4 100644 --- a/drivers/staging/ccree/ssi_aead.h +++ b/drivers/staging/ccree/cc_aead.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (C) 2012-2018 ARM Limited or its affiliates. */ -/* \file ssi_aead.h +/* \file cc_aead.h * ARM CryptoCell AEAD Crypto API */ diff --git a/drivers/staging/ccree/ssi_buffer_mgr.c b/drivers/staging/ccree/cc_buffer_mgr.c index 684070d30d7a..01c786ca6fae 100644 --- a/drivers/staging/ccree/ssi_buffer_mgr.c +++ b/drivers/staging/ccree/cc_buffer_mgr.c @@ -13,11 +13,11 @@ #include <linux/module.h> #include <linux/platform_device.h> -#include "ssi_buffer_mgr.h" +#include "cc_buffer_mgr.h" #include "cc_lli_defs.h" -#include "ssi_cipher.h" -#include "ssi_hash.h" -#include "ssi_aead.h" +#include "cc_cipher.h" +#include "cc_hash.h" +#include "cc_aead.h" enum dma_buffer_type { DMA_NULL_TYPE = -1, diff --git a/drivers/staging/ccree/ssi_buffer_mgr.h b/drivers/staging/ccree/cc_buffer_mgr.h index 0ddadd7ce1c3..99b752aa1077 100644 --- a/drivers/staging/ccree/ssi_buffer_mgr.h +++ b/drivers/staging/ccree/cc_buffer_mgr.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (C) 2012-2018 ARM Limited or its affiliates. */ -/* \file buffer_mgr.h +/* \file cc_buffer_mgr.h * Buffer Manager */ @@ -10,7 +10,7 @@ #include <crypto/algapi.h> -#include "ssi_driver.h" +#include "cc_driver.h" enum cc_req_dma_buf_type { CC_DMA_BUF_NULL = 0, diff --git a/drivers/staging/ccree/ssi_cipher.c b/drivers/staging/ccree/cc_cipher.c index a0e7d0094288..eca0578f8986 100644 --- a/drivers/staging/ccree/ssi_cipher.c +++ b/drivers/staging/ccree/cc_cipher.c @@ -13,11 +13,11 @@ #include <crypto/xts.h> #include <crypto/scatterwalk.h> -#include "ssi_driver.h" +#include "cc_driver.h" #include "cc_lli_defs.h" -#include "ssi_buffer_mgr.h" -#include "ssi_cipher.h" -#include "ssi_request_mgr.h" +#include "cc_buffer_mgr.h" +#include "cc_cipher.h" +#include "cc_request_mgr.h" #define MAX_ABLKCIPHER_SEQ_LEN 6 diff --git a/drivers/staging/ccree/ssi_cipher.h b/drivers/staging/ccree/cc_cipher.h index 97b266b787f7..4c181c721723 100644 --- a/drivers/staging/ccree/ssi_cipher.h +++ b/drivers/staging/ccree/cc_cipher.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (C) 2012-2018 ARM Limited or its affiliates. */ -/* \file ssi_cipher.h +/* \file cc_cipher.h * ARM CryptoCell Cipher Crypto API */ @@ -10,8 +10,8 @@ #include <linux/kernel.h> #include <crypto/algapi.h> -#include "ssi_driver.h" -#include "ssi_buffer_mgr.h" +#include "cc_driver.h" +#include "cc_buffer_mgr.h" /* Crypto cipher flags */ #define CC_CRYPTO_CIPHER_KEY_KFDE0 BIT(0) diff --git a/drivers/staging/ccree/cc_debugfs.c b/drivers/staging/ccree/cc_debugfs.c index 72eb2b39b16d..f927a736dff3 100644 --- a/drivers/staging/ccree/cc_debugfs.c +++ b/drivers/staging/ccree/cc_debugfs.c @@ -4,7 +4,7 @@ #include <linux/kernel.h> #include <linux/debugfs.h> #include <linux/stringify.h> -#include "ssi_driver.h" +#include "cc_driver.h" #include "cc_crypto_ctx.h" struct cc_debugfs_ctx { diff --git a/drivers/staging/ccree/ssi_driver.c b/drivers/staging/ccree/cc_driver.c index b5df9b4d85b0..98d491ee2656 100644 --- a/drivers/staging/ccree/ssi_driver.c +++ b/drivers/staging/ccree/cc_driver.c @@ -46,17 +46,17 @@ #include <linux/clk.h> #include <linux/of_address.h> -#include "ssi_driver.h" -#include "ssi_request_mgr.h" -#include "ssi_buffer_mgr.h" +#include "cc_driver.h" +#include "cc_request_mgr.h" +#include "cc_buffer_mgr.h" #include "cc_debugfs.h" -#include "ssi_cipher.h" -#include "ssi_aead.h" -#include "ssi_hash.h" -#include "ssi_ivgen.h" -#include "ssi_sram_mgr.h" -#include "ssi_pm.h" -#include "ssi_fips.h" +#include "cc_cipher.h" +#include "cc_aead.h" +#include "cc_hash.h" +#include "cc_ivgen.h" +#include "cc_sram_mgr.h" +#include "cc_pm.h" +#include "cc_fips.h" bool cc_dump_desc; module_param_named(dump_desc, cc_dump_desc, bool, 0600); diff --git a/drivers/staging/ccree/ssi_driver.h b/drivers/staging/ccree/cc_driver.h index c2b978bfb4e8..773ac591c45c 100644 --- a/drivers/staging/ccree/ssi_driver.h +++ b/drivers/staging/ccree/cc_driver.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (C) 2012-2018 ARM Limited or its affiliates. */ -/* \file ssi_driver.h +/* \file cc_driver.h * ARM CryptoCell Linux Crypto Driver */ @@ -26,11 +26,11 @@ #include <linux/platform_device.h> /* Registers definitions from shared/hw/ree_include */ -#include "dx_host.h" +#include "cc_host_regs.h" #define CC_DEV_SHA_MAX 512 #include "cc_crypto_ctx.h" #include "cc_hw_queue_defs.h" -#include "ssi_sram_mgr.h" +#include "cc_sram_mgr.h" extern bool cc_dump_desc; extern bool cc_dump_bytes; diff --git a/drivers/staging/ccree/ssi_fips.c b/drivers/staging/ccree/cc_fips.c index 2c58f9058071..b25c34e08717 100644 --- a/drivers/staging/ccree/ssi_fips.c +++ b/drivers/staging/ccree/cc_fips.c @@ -4,8 +4,8 @@ #include <linux/kernel.h> #include <linux/fips.h> -#include "ssi_driver.h" -#include "ssi_fips.h" +#include "cc_driver.h" +#include "cc_fips.h" static void fips_dsr(unsigned long devarg); diff --git a/drivers/staging/ccree/ssi_fips.h b/drivers/staging/ccree/cc_fips.h index 0d520030095b..0d520030095b 100644 --- a/drivers/staging/ccree/ssi_fips.h +++ b/drivers/staging/ccree/cc_fips.h diff --git a/drivers/staging/ccree/ssi_hash.c b/drivers/staging/ccree/cc_hash.c index 57031c748cbe..7c1645dd5184 100644 --- a/drivers/staging/ccree/ssi_hash.c +++ b/drivers/staging/ccree/cc_hash.c @@ -10,11 +10,11 @@ #include <crypto/md5.h> #include <crypto/internal/hash.h> -#include "ssi_driver.h" -#include "ssi_request_mgr.h" -#include "ssi_buffer_mgr.h" -#include "ssi_hash.h" -#include "ssi_sram_mgr.h" +#include "cc_driver.h" +#include "cc_request_mgr.h" +#include "cc_buffer_mgr.h" +#include "cc_hash.h" +#include "cc_sram_mgr.h" #define CC_MAX_HASH_SEQ_LEN 12 #define CC_MAX_OPAD_KEYS_SIZE CC_MAX_HASH_BLCK_SIZE diff --git a/drivers/staging/ccree/ssi_hash.h b/drivers/staging/ccree/cc_hash.h index e45bb69c6b55..aa42b8f4348d 100644 --- a/drivers/staging/ccree/ssi_hash.h +++ b/drivers/staging/ccree/cc_hash.h @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (C) 2012-2018 ARM Limited or its affiliates. */ -/* \file ssi_hash.h +/* \file cc_hash.h * ARM CryptoCell Hash Crypto API */ #ifndef __CC_HASH_H__ #define __CC_HASH_H__ -#include "ssi_buffer_mgr.h" +#include "cc_buffer_mgr.h" #define HMAC_IPAD_CONST 0x36363636 #define HMAC_OPAD_CONST 0x5C5C5C5C diff --git a/drivers/staging/ccree/dx_host.h b/drivers/staging/ccree/cc_host_regs.h index 69ef2fa0cb9b..69ef2fa0cb9b 100644 --- a/drivers/staging/ccree/dx_host.h +++ b/drivers/staging/ccree/cc_host_regs.h diff --git a/drivers/staging/ccree/cc_hw_queue_defs.h b/drivers/staging/ccree/cc_hw_queue_defs.h index bfc18b371f16..a79f28cec5ae 100644 --- a/drivers/staging/ccree/cc_hw_queue_defs.h +++ b/drivers/staging/ccree/cc_hw_queue_defs.h @@ -6,7 +6,7 @@ #include <linux/types.h> -#include "dx_crys_kernel.h" +#include "cc_kernel_regs.h" #include <linux/bitfield.h> /****************************************************************************** diff --git a/drivers/staging/ccree/ssi_ivgen.c b/drivers/staging/ccree/cc_ivgen.c index 2ba15a5c631f..43f70d46634a 100644 --- a/drivers/staging/ccree/ssi_ivgen.c +++ b/drivers/staging/ccree/cc_ivgen.c @@ -3,11 +3,11 @@ #include <linux/platform_device.h> #include <crypto/ctr.h> -#include "ssi_driver.h" -#include "ssi_ivgen.h" -#include "ssi_request_mgr.h" -#include "ssi_sram_mgr.h" -#include "ssi_buffer_mgr.h" +#include "cc_driver.h" +#include "cc_ivgen.h" +#include "cc_request_mgr.h" +#include "cc_sram_mgr.h" +#include "cc_buffer_mgr.h" /* The max. size of pool *MUST* be <= SRAM total size */ #define CC_IVPOOL_SIZE 1024 diff --git a/drivers/staging/ccree/ssi_ivgen.h b/drivers/staging/ccree/cc_ivgen.h index b6ac16903dda..b6ac16903dda 100644 --- a/drivers/staging/ccree/ssi_ivgen.h +++ b/drivers/staging/ccree/cc_ivgen.h diff --git a/drivers/staging/ccree/dx_crys_kernel.h b/drivers/staging/ccree/cc_kernel_regs.h index fa994406d610..fa994406d610 100644 --- a/drivers/staging/ccree/dx_crys_kernel.h +++ b/drivers/staging/ccree/cc_kernel_regs.h diff --git a/drivers/staging/ccree/ssi_pm.c b/drivers/staging/ccree/cc_pm.c index 3a8d91c4a11b..1f5da86348bd 100644 --- a/drivers/staging/ccree/ssi_pm.c +++ b/drivers/staging/ccree/cc_pm.c @@ -6,13 +6,13 @@ #include <linux/interrupt.h> #include <crypto/ctr.h> #include <linux/pm_runtime.h> -#include "ssi_driver.h" -#include "ssi_buffer_mgr.h" -#include "ssi_request_mgr.h" -#include "ssi_sram_mgr.h" -#include "ssi_ivgen.h" -#include "ssi_hash.h" -#include "ssi_pm.h" +#include "cc_driver.h" +#include "cc_buffer_mgr.h" +#include "cc_request_mgr.h" +#include "cc_sram_mgr.h" +#include "cc_ivgen.h" +#include "cc_hash.h" +#include "cc_pm.h" #define POWER_DOWN_ENABLE 0x01 #define POWER_DOWN_DISABLE 0x00 diff --git a/drivers/staging/ccree/ssi_pm.h b/drivers/staging/ccree/cc_pm.h index f603255daed6..aac8190fea38 100644 --- a/drivers/staging/ccree/ssi_pm.h +++ b/drivers/staging/ccree/cc_pm.h @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (C) 2012-2018 ARM Limited or its affiliates. */ -/* \file ssi_pm.h +/* \file cc_pm.h */ #ifndef __CC_POWER_MGR_H__ #define __CC_POWER_MGR_H__ -#include "ssi_driver.h" +#include "cc_driver.h" #define CC_SUSPEND_TIMEOUT 3000 diff --git a/drivers/staging/ccree/ssi_request_mgr.c b/drivers/staging/ccree/cc_request_mgr.c index dc3be2923342..cbcfcc3302b2 100644 --- a/drivers/staging/ccree/ssi_request_mgr.c +++ b/drivers/staging/ccree/cc_request_mgr.c @@ -7,11 +7,11 @@ #include <linux/delay.h> #include <crypto/ctr.h> #include <linux/pm_runtime.h> -#include "ssi_driver.h" -#include "ssi_buffer_mgr.h" -#include "ssi_request_mgr.h" -#include "ssi_ivgen.h" -#include "ssi_pm.h" +#include "cc_driver.h" +#include "cc_buffer_mgr.h" +#include "cc_request_mgr.h" +#include "cc_ivgen.h" +#include "cc_pm.h" #define CC_MAX_POLL_ITER 10 /* The highest descriptor count in used */ diff --git a/drivers/staging/ccree/ssi_request_mgr.h b/drivers/staging/ccree/cc_request_mgr.h index f11a26a98bce..573cb97af085 100644 --- a/drivers/staging/ccree/ssi_request_mgr.h +++ b/drivers/staging/ccree/cc_request_mgr.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (C) 2012-2018 ARM Limited or its affiliates. */ -/* \file request_mgr.h +/* \file cc_request_mgr.h * Request Manager */ diff --git a/drivers/staging/ccree/ssi_sram_mgr.c b/drivers/staging/ccree/cc_sram_mgr.c index c5497aacc71d..d1f8a9cc1c0f 100644 --- a/drivers/staging/ccree/ssi_sram_mgr.c +++ b/drivers/staging/ccree/cc_sram_mgr.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (C) 2012-2018 ARM Limited or its affiliates. */ -#include "ssi_driver.h" -#include "ssi_sram_mgr.h" +#include "cc_driver.h" +#include "cc_sram_mgr.h" /** * struct cc_sram_ctx -Internal RAM context manager diff --git a/drivers/staging/ccree/ssi_sram_mgr.h b/drivers/staging/ccree/cc_sram_mgr.h index d48649fb3323..d48649fb3323 100644 --- a/drivers/staging/ccree/ssi_sram_mgr.h +++ b/drivers/staging/ccree/cc_sram_mgr.h |