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: 148015 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp5627068lji; Tue, 2 Oct 2018 13:57:39 -0700 (PDT) X-Google-Smtp-Source: ACcGV60dz72JyRfYgfdr0dXCOzEmuXvNl0p2ZobOfRhrKWsRgnTAu1WsTmoXcg0UebEo+KeVxv7T X-Received: by 2002:a63:ee43:: with SMTP id n3-v6mr10653479pgk.234.1538513858933; Tue, 02 Oct 2018 13:57:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538513858; cv=none; d=google.com; s=arc-20160816; b=uFxmtV29F/9MSoSTDDjA3rRN/JhN0ma13ZLO0iXRur1WVzRLbP4rTcXNZGQOl1HheY jRzXHc6Np4dT0VZaIEfXQYjLPTXUk5AG489no14Or8uM712SezkUc/Eg7kLueYY8Y/HO y7stVVH3tKx+wHdTy1TWoGzvWF8bZ+MqXmL6//jUK7tLGCO3+6U1r2YEDV3XKxOMRYG7 hdzkT5dWokJU7HWuDc+S7qSw1aE3Z2tj9OU/gVntb5SJjNstUGAZTZ7yFUivmHxlzdqP zpzRWR2ZVYrWVTE2lZCzheMj/mZYvrAH/2DHW4xejAirqBAp3uHwIRc9spvlJSoYhI8P EjRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=un0zNYNU9+XEt043PZ696YrdRw37gj9e6fdgWIYTTLc=; b=iiolqmUjxwOCk4SQEkScb25Qgmn/lMy2jnr9Wp4MJWlgGdCLcOOOzeW5Fenhv7Bv2O of1c0pxgA8O6J0YbLV4nTo/wRBsGkgwcbFLQDve514trQoZMQ/d/JXKiTvW6Ux9rW+wL bcrRLfGvmOHfk85XUEUAcmQbTdJH44ztsbGHaMSpX0OXvWF2wDF3P6xV+rmoiD/FrWJU DxqaAVQl8mePAQ8qCjrRui/XEdH07dnMzX97uQyPjEOp1Xkn4S6jCwd3Y5IQnQRVr/JP K7P2IkaUHcM1Pk8P8jm/stNvYssx4X39onNpK0HHqbYXlq0GO2WgH5MtxoZf9oPDK3Bq 4VaQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h88-v6si2212793pfk.78.2018.10.02.13.57.38; Tue, 02 Oct 2018 13:57:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727051AbeJCDmu (ORCPT + 2 others); 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 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 --- drivers/crypto/caam/caamalg_qi2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0 Acked-by: Horia Geantă 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;