OSDN Git Service

crypto: caam/qi2 - avoid double export
authorArnd Bergmann <arnd@arndb.de>
Tue, 2 Oct 2018 20:56:19 +0000 (22:56 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 8 Oct 2018 05:45:41 +0000 (13:45 +0800)
commit52813ab249590595e43c8b03227adaa29ceceb33
treef9514847a80877192a44019d66daf5833cb81226
parentfadd7a6e616b89c7f4f7bfa7b824f290bab32c3c
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 <arnd@arndb.de>
Acked-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/caam/caamalg_qi2.c