From patchwork Tue Oct 2 20:56:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10624023 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3206D14BD for ; Tue, 2 Oct 2018 20:57:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 169D62842E for ; Tue, 2 Oct 2018 20:57:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08C4328446; Tue, 2 Oct 2018 20:57:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C10F2842E for ; Tue, 2 Oct 2018 20:57:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727051AbeJCDmu (ORCPT ); Tue, 2 Oct 2018 23:42:50 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:33181 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726572AbeJCDmu (ORCPT ); Tue, 2 Oct 2018 23:42:50 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1MtO06-1fsNtC0qjO-00ut0i; Tue, 02 Oct 2018 22:57:24 +0200 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1MtO06-1fsNtC0qjO-00ut0i; Tue, 02 Oct 2018 22:57:24 +0200 From: Arnd Bergmann To: =?utf-8?q?Horia_Geant=C4=83?= , Aymen Sghaier , Herbert Xu , "David S. Miller" Cc: Arnd Bergmann , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] crypto: caam/qi2 - avoid double export Date: Tue, 2 Oct 2018 22:56:19 +0200 Message-Id: <20181002205720.2255567-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:PvxzUDD4cvBR3xNIRfwiIYy7g6ReIrwKzR6Ph7nOpDkc+QIrtTL qj6PEqIL5K9upnbL1KjmOh0q5ygqwBo8639Np2CUTlrlFAH7uOnLKRjLQBzhSwebjCnTTrR 53hJzUU/Z5KRv4ifwBNFB2kD0iQ+fy/8ZnvE293PaRnxlKr8V96PrTaLNO34l2O2RnqLGV0 LBNabjGplVAzwQwxUaXVg== X-UI-Out-Filterresults: notjunk:1;V01:K0:m4t4M12xlno=:bFOog5m5UcNpizBcpmlCDY ZYcgllY7Guq/JNAAjP20CY2Bg5mtizE775Dz/PP117B/vUXmoFsfX6qwN/bbs4O3U5LIBesP+ pCv6TqmvxaSuFtv7CzFRXYU7Hlt+nq9RFEZxw2U5BV6XLR5xcPe2a39AXVoTYKeUqr/WGQMgd RckQt/BakHxxj9HgYdauO0UfaLsrduBoxhnbfXJuEAIytx42IaTa9R1n22UojHQnz4HxVb992 79Nqh5hJ5BntQoRD5hgfRBNytTvusKqlAAWfHgUepe5kD1GjfQDqzKgWSJj67ELFPmFAYYiFO xTAM3+TEQZPmKkCfrwzD+letCgyYymha/AbeY+9I5t9uk8Qkd6bVY5tjZhg+JXxcVOxk7XOH8 YtZ23UBJgZeCBnA3Ac7X7YIYBlfunFxazpdvMCnYArPvYV1J88TpZy/XIOBu3o8QB5bSm6/Nq g1SRYd5zg8+zS/mDeIoq6NBT95JvnJD6V5tNrA9/6Zu0G/OGTY2n9ve6s1vxznNOW9sS8Rspk 6KmNbJ0agDC7rqJ/oULvEYpmNw6fce8BZPhoQRKdYzq4CYRS8oqH/3AE627Bz2jWPrUuthRX9 oL0CgGtgfCYAktTeRxqEs69tYp1DrV68mBcL+uq5Sh4TmE2ywJOuIwXlh2FjLq0IhqNYUU329 T1fGgu2VaSZO2e9Ho4y1gPcpowhM5JP4jiEhhGgi6sVw3ZJhCVIn01N+g1776K0X09OE= Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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ă --- drivers/crypto/caam/caamalg_qi2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c index 2f569d0231f9..7d8ac0222fa3 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;