From patchwork Mon Nov 13 14:45:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 118788 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1879211qgn; Mon, 13 Nov 2017 06:46:44 -0800 (PST) X-Google-Smtp-Source: AGs4zMa4gH67TxqDoJlkBxf0wyLOeI1uqUTOn5AvEwSnf/81mPB/cw1wIxbr58Juk+sm+IVhIaff X-Received: by 10.159.207.149 with SMTP id z21mr9055612plo.258.1510584404733; Mon, 13 Nov 2017 06:46:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510584404; cv=none; d=google.com; s=arc-20160816; b=las18DHM3p/CTfuDqL/H8sL7c4pc5yoilXuadz/fx4moAt7fIRZigrHldDRPVBm92T RWKXeNFGMo0TcIDm5emJnepv3bLjKJ/hVKupC731i/kyATymmQXM5bI9fjx/3yCc0zy0 ZuGdNLb7QzCExkXEg+8f/Ylf1UxTRbSGM9AeEKaWdVYn5KSiv1rMw4Sh780xHQnpTfER /1Lc4pVTJjouHKPxKSFvSjjvSTFWz9LvsdvuDETphw4+OIAkGJ9Gdc+SL/l1pr8Cxi1R mPjQWnYa5bBP2t/OU2aQ5708k3Dipa4eh/jwXYBiEbhAexx2S5YjOqbIJPCzWYTJebQs LURg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=3r+SzRUV5Bzk4Lg1jv4fnh18+lz0WPR9FnsOj1tzRiE=; b=DDTT0+OETJkymmWOFmTjHSCaL0prwkXA1lrnWOvGpeHESWLq3eaLoeWXzIi0o+bRZM pqmIF/e6xxW4zph1VHr+VvMljbdZ4G6CyMV3YB47aY8Xhl4paNztktcmT4nDmpjRc9es PjHAuvlqtZAvUwJgpI3OUSouXTQ9jEq8VEd9gUzp7tnBAxORfCrdLZAzLf8Ad75LTLEs 2sM8Z75moZqnTS7UqN79CpSchE5YqX3Qdjb/PNJ+LDFyus2LjRpzOeXdXkUM+1nz+YLf R5QcdWRLQgCJqg0mg+t8Hn+GU6Y9QocU20YY97zMxjjdYwxiiBAcTfRlhQt23LzfMxdO bEMw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 1si14111439pli.120.2017.11.13.06.46.44; Mon, 13 Nov 2017 06:46:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753131AbdKMOql (ORCPT + 27 others); Mon, 13 Nov 2017 09:46:41 -0500 Received: from foss.arm.com ([217.140.101.70]:47274 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753078AbdKMOqi (ORCPT ); Mon, 13 Nov 2017 09:46:38 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B99011435; Mon, 13 Nov 2017 06:46:37 -0800 (PST) Received: from sugar.kfn.arm.com (unknown [10.45.48.133]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 222F53F318; Mon, 13 Nov 2017 06:46:35 -0800 (PST) From: Gilad Ben-Yossef To: Greg Kroah-Hartman Cc: Ofir Drang , linux-crypto@vger.kernel.org, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/24] staging: ccree: remove MIN/MAX macros Date: Mon, 13 Nov 2017 14:45:32 +0000 Message-Id: <1510584358-29473-5-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510584358-29473-1-git-send-email-gilad@benyossef.com> References: <1510584358-29473-1-git-send-email-gilad@benyossef.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver was using open coded MIN/MAX macros to compute fixed defines. Remove them and use bigger value always instead. Signed-off-by: Gilad Ben-Yossef --- drivers/staging/ccree/ssi_aead.h | 2 +- drivers/staging/ccree/ssi_driver.h | 3 --- drivers/staging/ccree/ssi_hash.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/staging/ccree/ssi_aead.h b/drivers/staging/ccree/ssi_aead.h index e85bcd9..580fdb8 100644 --- a/drivers/staging/ccree/ssi_aead.h +++ b/drivers/staging/ccree/ssi_aead.h @@ -28,7 +28,7 @@ /* mac_cmp - HW writes 8 B but all bytes hold the same value */ #define ICV_CMP_SIZE 8 #define CCM_CONFIG_BUF_SIZE (AES_BLOCK_SIZE * 3) -#define MAX_MAC_SIZE MAX(SHA256_DIGEST_SIZE, AES_BLOCK_SIZE) +#define MAX_MAC_SIZE SHA256_DIGEST_SIZE /* defines for AES GCM configuration buffer */ #define GCM_BLOCK_LEN_SIZE 8 diff --git a/drivers/staging/ccree/ssi_driver.h b/drivers/staging/ccree/ssi_driver.h index f4967ca..758268e 100644 --- a/drivers/staging/ccree/ssi_driver.h +++ b/drivers/staging/ccree/ssi_driver.h @@ -95,9 +95,6 @@ * field in the HW descriptor. The DMA engine +8 that value. */ -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#define MAX(a, b) (((a) > (b)) ? (a) : (b)) - #define SSI_MAX_IVGEN_DMA_ADDRESSES 3 struct ssi_crypto_req { void (*user_cb)(struct device *dev, void *req); diff --git a/drivers/staging/ccree/ssi_hash.c b/drivers/staging/ccree/ssi_hash.c index 1fda84d..8414c25 100644 --- a/drivers/staging/ccree/ssi_hash.c +++ b/drivers/staging/ccree/ssi_hash.c @@ -32,7 +32,7 @@ #include "ssi_sram_mgr.h" #define SSI_MAX_AHASH_SEQ_LEN 12 -#define SSI_MAX_HASH_OPAD_TMP_KEYS_SIZE MAX(SSI_MAX_HASH_BLCK_SIZE, 3 * AES_BLOCK_SIZE) +#define SSI_MAX_HASH_OPAD_TMP_KEYS_SIZE SSI_MAX_HASH_BLCK_SIZE struct ssi_hash_handle { ssi_sram_addr_t digest_len_sram_addr; /* const value in SRAM*/