Received: by 2002:a25:86ce:0:0:0:0:0 with SMTP id y14csp960526ybm; Tue, 21 May 2019 06:35:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqyRNpTENPFc/2KCjvgp9jq97OIev+Uz09lu8cMDmz9GrIqxiN8TQIpnWqlUrdhax0uGPxR2 X-Received: by 2002:a17:902:ab97:: with SMTP id f23mr28190331plr.237.1558445720210; Tue, 21 May 2019 06:35:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558445720; cv=none; d=google.com; s=arc-20160816; b=CysJF+3leuF2VqdiXSAL33rFJxsbMeI+iGbdyqna1kq5VgtWI8XQ+VFdLS+vesT9W3 T4aiDWN827J3l2MgcXSGn3oAhXjFJKVOUAmIiN0cNGjwRGqvvzXliVHnTLCq15qL73Yc 2Pdt9XQeGfRVeKsCrJj5bF0mmkXEQDH/eM2+PP5N4rY00Veu5Hg02wiCB9b5b7RzRFhC DapTmdScXQqgGDiOfhfh+BYyJuufgxGdNVkXtn0dJcVHzxFKi1SZFyDHQX3o7MYfCAbC ya1iBq4b7913maLndf2HOtmt2rpIkWABnyV2o8QHef9x6Kigl8HX7Kj7wuVZkFkTEDd3 NMjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=97UiAiw0Z+TKwMmqYH+9V/rApIAY8c8v8ygR23KprmY=; b=Apfz0A0DV53BZIV1+JXaGDlA78qFEZWYAvhXEy1mxpRQJal9SVwikJCuMVZJtwjQTd N0ilAnP+4/d9Q2c4cyvOjyrK6LGd8nzM28++67SLv0dCvGAAqBqTf72zueP8VRlpi8it MdCXc4Fr8FtGC7LriYNSUwrPAzZIBcp+lepd2RvjDf+iDYrNitvPFFLJSbvTWoOnUbdi VHXwu2IN3qCnGZXn3l4I9aMsde2GzMlAPIp6QXMQ+rEYL+ZJVtb4/KsSEUdhDejaphBx dFiDP53OhhHaP8c6sxRJlXxjuySVzGOwP3CcPOFAdA7NMp2qet/7skjTUSUUETejlbpL g5TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=QZvVTsrv; 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 60si21723635pla.90.2019.05.21.06.35.05; Tue, 21 May 2019 06:35:20 -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; dkim=pass header.i=@c-s.fr header.s=mail header.b=QZvVTsrv; 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 S1728091AbfEUNeg (ORCPT + 99 others); Tue, 21 May 2019 09:34:36 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:58231 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728508AbfEUNeW (ORCPT ); Tue, 21 May 2019 09:34:22 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 457cDr1vX4z9v2XZ; Tue, 21 May 2019 15:34:20 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=QZvVTsrv; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id I2YW1po2_m4H; Tue, 21 May 2019 15:34:20 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 457cDr0sNQz9v2XX; Tue, 21 May 2019 15:34:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1558445660; bh=97UiAiw0Z+TKwMmqYH+9V/rApIAY8c8v8ygR23KprmY=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=QZvVTsrvjWYNiQaLmESkKBeruJVaLm+YCLpEm64j6w2Onhbmb92mU1Y64n71eNNsr Zo11tMxCTjtX+6SwKFqxSRvnyZHL2QNNuI12rZFZl1nP+CTGFgmnzwN/8ONu/xdUFy RvS4zHBP3pKrmaOmLmnB8nHA9YKPNVIqbe8+eoEQ= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 8BC868B80C; Tue, 21 May 2019 15:34:21 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id LVhWi5UGWrbx; Tue, 21 May 2019 15:34:21 +0200 (CEST) Received: from po16846vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 5B01B8B803; Tue, 21 May 2019 15:34:21 +0200 (CEST) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 1EB2F68458; Tue, 21 May 2019 13:34:21 +0000 (UTC) Message-Id: <4d3dec78e9ac8716fa4c9b1f36d2f975c6cc6b7c.1558445259.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v1 14/15] crypto: talitos - use IS_ENABLED() in has_ftr_sec1() To: Herbert Xu , "David S. Miller" , horia.geanta@nxp.com Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 21 May 2019 13:34:21 +0000 (UTC) Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org This patch rewrites has_ftr_sec1() using IS_ENABLED() instead of #ifdefs Signed-off-by: Christophe Leroy --- drivers/crypto/talitos.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/talitos.h b/drivers/crypto/talitos.h index 95e97951b924..5699d46401e6 100644 --- a/drivers/crypto/talitos.h +++ b/drivers/crypto/talitos.h @@ -164,13 +164,11 @@ struct talitos_private { */ static inline bool has_ftr_sec1(struct talitos_private *priv) { -#if defined(CONFIG_CRYPTO_DEV_TALITOS1) && defined(CONFIG_CRYPTO_DEV_TALITOS2) - return priv->features & TALITOS_FTR_SEC1 ? true : false; -#elif defined(CONFIG_CRYPTO_DEV_TALITOS1) - return true; -#else - return false; -#endif + if (IS_ENABLED(CONFIG_CRYPTO_DEV_TALITOS1) && + IS_ENABLED(CONFIG_CRYPTO_DEV_TALITOS2)) + return priv->features & TALITOS_FTR_SEC1; + + return IS_ENABLED(CONFIG_CRYPTO_DEV_TALITOS1); } /* -- 2.13.3