From: Arnd Bergmann Date: Tue, 2 Oct 2018 20:56:19 +0000 (+0200) Subject: crypto: caam/qi2 - avoid double export X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=52813ab249590595e43c8b03227adaa29ceceb33;p=linux.git crypto: caam/qi2 - avoid double export Both the caam ctrl file and dpaa2_caam export a couple of flags. They use an #ifdef check to make sure that each flag is only built once, but this fails if they are both loadable modules: WARNING: drivers/crypto/caam/dpaa2_caam: 'caam_little_end' exported twice. Previous export was in drivers/crypto/caam/caam.ko WARNING: drivers/crypto/caam/dpaa2_caam: 'caam_imx' exported twice. Previous export was in drivers/crypto/caam/caam.ko Change the #ifdef to an IS_ENABLED() check in order to make it work in all configurations. It may be better to redesign this aspect of the two drivers in a cleaner way. Fixes: 8d818c105501 ("crypto: caam/qi2 - add DPAA2-CAAM driver") Signed-off-by: Arnd Bergmann Acked-by: Horia Geantă Signed-off-by: Herbert Xu --- diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c index 2f569d0231f9a..7d8ac0222fa3b 100644 --- a/drivers/crypto/caam/caamalg_qi2.c +++ b/drivers/crypto/caam/caamalg_qi2.c @@ -25,7 +25,7 @@ #define CAAM_MAX_KEY_SIZE (AES_MAX_KEY_SIZE + CTR_RFC3686_NONCE_SIZE + \ SHA512_DIGEST_SIZE * 2) -#ifndef CONFIG_CRYPTO_DEV_FSL_CAAM +#if !IS_ENABLED(CONFIG_CRYPTO_DEV_FSL_CAAM) bool caam_little_end; EXPORT_SYMBOL(caam_little_end); bool caam_imx;