crypto: api - Fix CRYPTO_USER checks for report function

Checking the config via ifdef incorrectly compiles out the report
functions when CRYPTO_USER is set to =m. Fix it by using IS_ENABLED()
instead.

Fixes: c0f9e01dd266 ("crypto: api - Check CRYPTO_USER instead of NET for report")
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/acompress.c b/crypto/acompress.c
index 82a290d..1c68281 100644 (file)
--- a/crypto/acompress.c
+++ b/crypto/acompress.c
@@ -125,7 +125,7 @@ static const struct crypto_type crypto_acomp_type = {
 #ifdef CONFIG_PROC_FS
        .show = crypto_acomp_show,
 #endif
-#ifdef CONFIG_CRYPTO_USER
+#if IS_ENABLED(CONFIG_CRYPTO_USER)
        .report = crypto_acomp_report,
 #endif
 #ifdef CONFIG_CRYPTO_STATS

diff --git a/crypto/aead.c b/crypto/aead.c
index ffc48a7..d5ba204 100644 (file)
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -242,7 +242,7 @@ static const struct crypto_type crypto_aead_type = {
 #ifdef CONFIG_PROC_FS
        .show = crypto_aead_show,
 #endif
-#ifdef CONFIG_CRYPTO_USER
+#if IS_ENABLED(CONFIG_CRYPTO_USER)
        .report = crypto_aead_report,
 #endif
 #ifdef CONFIG_CRYPTO_STATS

diff --git a/crypto/ahash.c b/crypto/ahash.c
index b8a6079..3246510 100644 (file)
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -509,7 +509,7 @@ static const struct crypto_type crypto_ahash_type = {
 #ifdef CONFIG_PROC_FS
        .show = crypto_ahash_show,
 #endif
-#ifdef CONFIG_CRYPTO_USER
+#if IS_ENABLED(CONFIG_CRYPTO_USER)
        .report = crypto_ahash_report,
 #endif
 #ifdef CONFIG_CRYPTO_STATS

diff --git a/crypto/akcipher.c b/crypto/akcipher.c
index 186e762..7960ceb 100644 (file)
--- a/crypto/akcipher.c
+++ b/crypto/akcipher.c
@@ -98,7 +98,7 @@ static const struct crypto_type crypto_akcipher_type = {
 #ifdef CONFIG_PROC_FS
        .show = crypto_akcipher_show,
 #endif
-#ifdef CONFIG_CRYPTO_USER
+#if IS_ENABLED(CONFIG_CRYPTO_USER)
        .report = crypto_akcipher_report,
 #endif
 #ifdef CONFIG_CRYPTO_STATS

diff --git a/crypto/kpp.c b/crypto/kpp.c
index 74f2e8e..33d44e5 100644 (file)
--- a/crypto/kpp.c
+++ b/crypto/kpp.c
@@ -96,7 +96,7 @@ static const struct crypto_type crypto_kpp_type = {
 #ifdef CONFIG_PROC_FS
        .show = crypto_kpp_show,
 #endif
-#ifdef CONFIG_CRYPTO_USER
+#if IS_ENABLED(CONFIG_CRYPTO_USER)
        .report = crypto_kpp_report,
 #endif
 #ifdef CONFIG_CRYPTO_STATS

diff --git a/crypto/rng.c b/crypto/rng.c
index ffde0f6..279dffd 100644 (file)
--- a/crypto/rng.c
+++ b/crypto/rng.c
@@ -118,7 +118,7 @@ static const struct crypto_type crypto_rng_type = {
 #ifdef CONFIG_PROC_FS
        .show = crypto_rng_show,
 #endif
-#ifdef CONFIG_CRYPTO_USER
+#if IS_ENABLED(CONFIG_CRYPTO_USER)
        .report = crypto_rng_report,
 #endif
 #ifdef CONFIG_CRYPTO_STATS

diff --git a/crypto/scompress.c b/crypto/scompress.c
index 24138b4..442a82c 100644 (file)
--- a/crypto/scompress.c
+++ b/crypto/scompress.c
@@ -240,7 +240,7 @@ static const struct crypto_type crypto_scomp_type = {
 #ifdef CONFIG_PROC_FS
        .show = crypto_scomp_show,
 #endif
-#ifdef CONFIG_CRYPTO_USER
+#if IS_ENABLED(CONFIG_CRYPTO_USER)
        .report = crypto_scomp_report,
 #endif
 #ifdef CONFIG_CRYPTO_STATS

diff --git a/crypto/shash.c b/crypto/shash.c
index 5845b7d..717b42d 100644 (file)
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -548,7 +548,7 @@ static const struct crypto_type crypto_shash_type = {
 #ifdef CONFIG_PROC_FS
        .show = crypto_shash_show,
 #endif
-#ifdef CONFIG_CRYPTO_USER
+#if IS_ENABLED(CONFIG_CRYPTO_USER)
        .report = crypto_shash_report,
 #endif
 #ifdef CONFIG_CRYPTO_STATS

diff --git a/crypto/skcipher.c b/crypto/skcipher.c
index 6caca02..7b27571 100644 (file)
--- a/crypto/skcipher.c
+++ b/crypto/skcipher.c
@@ -776,7 +776,7 @@ static const struct crypto_type crypto_skcipher_type = {
 #ifdef CONFIG_PROC_FS
        .show = crypto_skcipher_show,
 #endif
-#ifdef CONFIG_CRYPTO_USER
+#if IS_ENABLED(CONFIG_CRYPTO_USER)
        .report = crypto_skcipher_report,
 #endif
 #ifdef CONFIG_CRYPTO_STATS