Commit 304576a7 authored by Valentin Rothberg's avatar Valentin Rothberg Committed by Herbert Xu

crypto: aesni - remove unnecessary #define

The CPP identifier 'HAS_PCBC' is defined when the Kconfig
option CRYPTO_PCBC is set as 'y' or 'm', and is further
used in two ifdef blocks to conditionally compile source
code. This indirection hides the actual Kconfig dependency
and complicates readability. Moreover, it's inconsistent
with the rest of the ifdef blocks in the file, which
directly reference Kconfig options.

This patch removes 'HAS_PCBC' and replaces its occurrences
with the actual dependency on 'CRYPTO_PCBC' being set as
'y' or 'm'.
Signed-off-by: default avatarValentin Rothberg <valentinrothberg@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent bac68f2c
...@@ -43,10 +43,6 @@ ...@@ -43,10 +43,6 @@
#include <asm/crypto/glue_helper.h> #include <asm/crypto/glue_helper.h>
#endif #endif
#if defined(CONFIG_CRYPTO_PCBC) || defined(CONFIG_CRYPTO_PCBC_MODULE)
#define HAS_PCBC
#endif
/* This data is stored at the end of the crypto_tfm struct. /* This data is stored at the end of the crypto_tfm struct.
* It's a type of per "session" data storage location. * It's a type of per "session" data storage location.
* This needs to be 16 byte aligned. * This needs to be 16 byte aligned.
...@@ -547,7 +543,7 @@ static int ablk_ctr_init(struct crypto_tfm *tfm) ...@@ -547,7 +543,7 @@ static int ablk_ctr_init(struct crypto_tfm *tfm)
#endif #endif
#ifdef HAS_PCBC #if IS_ENABLED(CONFIG_CRYPTO_PCBC)
static int ablk_pcbc_init(struct crypto_tfm *tfm) static int ablk_pcbc_init(struct crypto_tfm *tfm)
{ {
return ablk_init_common(tfm, "fpu(pcbc(__driver-aes-aesni))"); return ablk_init_common(tfm, "fpu(pcbc(__driver-aes-aesni))");
...@@ -1377,7 +1373,7 @@ static struct crypto_alg aesni_algs[] = { { ...@@ -1377,7 +1373,7 @@ static struct crypto_alg aesni_algs[] = { {
}, },
}, },
#endif #endif
#ifdef HAS_PCBC #if IS_ENABLED(CONFIG_CRYPTO_PCBC)
}, { }, {
.cra_name = "pcbc(aes)", .cra_name = "pcbc(aes)",
.cra_driver_name = "pcbc-aes-aesni", .cra_driver_name = "pcbc-aes-aesni",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment