From patchwork Mon Nov 13 14:45:48 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: 118805 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp1132556edl; Mon, 13 Nov 2017 06:48:26 -0800 (PST) X-Google-Smtp-Source: AGs4zMaB+6oVvo3BnqK3JJYib7PatkXnn40JNFuVNKtLCPHLBiLMMP6jgk120iN84OI49S57aRPg X-Received: by 10.99.143.27 with SMTP id n27mr8962126pgd.121.1510584506303; Mon, 13 Nov 2017 06:48:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510584506; cv=none; d=google.com; s=arc-20160816; b=AP+YYqggd48SqbrsBj71O8bA3edTaVFKiEyQIvDoY8NlrlIgrqWPh69y6PkJvsXcMh 8T8unyWR0o0fnV7SEOAkHkovTSoMUaqdeXVR0jHiE5myQSLmghr2JoP1n2YPGx4RUtiM hmIylrlzxQ7RnnxIJtfJIX8Vyq3c2VY8qx7JVboWVlGXptyqPFPsqJqE+b6fghpOekmo x/nTcOzj7o3Jg61vJmDwdaIKjCqCKCT9v93bx4i+j6KHJagyW8tc411de6EDgSvIMVuz sUwGIERT96UJmGFaPj7BbG8kTZJ6FCtraQmtn67pKk6HTwwnUWtdlMTR39dSDS9xIcDh pNZA== 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=pRIuGN4r0eewnqn3W++Jc8ul+3qyagqgSu5ZtCebAeo=; b=mHUEvHAJp3uSxNvcAA4RaM3JfsfNMlVuyIBafOq+PuXwcSHOKUzJMqQ3wDQgE+EJtg 5yYMyG99K+SlMZZwpjiLF5SCD+89ndzYyS4YJBxUugqlJ90fzbXkl5wFLC8chi9mCSbo d/j7rmCQ5Wug6EHKcD2bAPPpUkx/6WojlS2UTXUZAV1PkJL2PY8m8nirmP1dIEOT00Z9 cNok3aL6HTpkYbZQb63vsizTdB2Lo0nvuJh1AmJ5yb5sMBq9CjtmyTg0XQyENBsxKIpq eTUKV4f5UNXHzICAu39xCc0LHaUvxs276FB4uZe96QMljU7ihunqvKuqxFQvIOIGYZeP hwOA== 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 t191si13686562pgc.2.2017.11.13.06.48.26; Mon, 13 Nov 2017 06:48:26 -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 S1753552AbdKMOsY (ORCPT + 27 others); Mon, 13 Nov 2017 09:48:24 -0500 Received: from foss.arm.com ([217.140.101.70]:47456 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752981AbdKMOsV (ORCPT ); Mon, 13 Nov 2017 09:48:21 -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 E6F201435; Mon, 13 Nov 2017 06:48:20 -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 5357A3F318; Mon, 13 Nov 2017 06:48:19 -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 20/24] staging: ccree: remove unneeded wrapper function Date: Mon, 13 Nov 2017 14:45:48 +0000 Message-Id: <1510584358-29473-21-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 Remove unneeded wrapper function to simplify code. Signed-off-by: Gilad Ben-Yossef --- drivers/staging/ccree/ssi_hash.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) -- 2.7.4 diff --git a/drivers/staging/ccree/ssi_hash.c b/drivers/staging/ccree/ssi_hash.c index afdc44e..a2e8a9d 100644 --- a/drivers/staging/ccree/ssi_hash.c +++ b/drivers/staging/ccree/ssi_hash.c @@ -986,10 +986,8 @@ static int ssi_hash_init(struct ahash_req_ctx *state, struct ssi_hash_ctx *ctx) return 0; } -static int ssi_hash_setkey(void *hash, - const u8 *key, - unsigned int keylen, - bool synchronize) +static int ssi_ahash_setkey(struct crypto_ahash *ahash, const u8 *key, + unsigned int keylen) { unsigned int hmac_pad_const[2] = { HMAC_IPAD_CONST, HMAC_OPAD_CONST }; struct ssi_crypto_req ssi_req = {}; @@ -1001,12 +999,12 @@ static int ssi_hash_setkey(void *hash, ssi_sram_addr_t larval_addr; struct device *dev; - ctx = crypto_ahash_ctx(((struct crypto_ahash *)hash)); + ctx = crypto_ahash_ctx(ahash); dev = drvdata_to_dev(ctx->drvdata); dev_dbg(dev, "start keylen: %d", keylen); - blocksize = crypto_tfm_alg_blocksize(&((struct crypto_ahash *)hash)->base); - digestsize = crypto_ahash_digestsize(((struct crypto_ahash *)hash)); + blocksize = crypto_tfm_alg_blocksize(&ahash->base); + digestsize = crypto_ahash_digestsize(ahash); larval_addr = cc_larval_digest_addr(ctx->drvdata, ctx->hash_mode); @@ -1167,8 +1165,7 @@ static int ssi_hash_setkey(void *hash, out: if (rc) - crypto_ahash_set_flags((struct crypto_ahash *)hash, - CRYPTO_TFM_RES_BAD_KEY_LEN); + crypto_ahash_set_flags(ahash, CRYPTO_TFM_RES_BAD_KEY_LEN); if (ctx->key_params.key_dma_addr) { dma_unmap_single(dev, ctx->key_params.key_dma_addr, @@ -1879,12 +1876,6 @@ static int ssi_ahash_import(struct ahash_request *req, const void *in) return rc; } -static int ssi_ahash_setkey(struct crypto_ahash *ahash, - const u8 *key, unsigned int keylen) -{ - return ssi_hash_setkey((void *)ahash, key, keylen, false); -} - struct ssi_hash_template { char name[CRYPTO_MAX_ALG_NAME]; char driver_name[CRYPTO_MAX_ALG_NAME];