From patchwork Fri Sep 8 20:01:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: srishti X-Patchwork-Id: 9944973 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.web.codeaurora.org (Postfix) with ESMTP id 9601D604D4 for ; Fri, 8 Sep 2017 20:01:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E521288BC for ; Fri, 8 Sep 2017 20:01:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 82DC0288C2; Fri, 8 Sep 2017 20:01:48 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 312AF288BC for ; Fri, 8 Sep 2017 20:01:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756835AbdIHUBq (ORCPT ); Fri, 8 Sep 2017 16:01:46 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:34607 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756799AbdIHUBp (ORCPT ); Fri, 8 Sep 2017 16:01:45 -0400 Received: by mail-pf0-f196.google.com with SMTP id g65so1646567pfe.1; Fri, 08 Sep 2017 13:01:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=x4yuuS6m1ahEvmnctGXiEwC/JlHXVOzHsSQG4YEbXD4=; b=IXFS0ZqSMJ9S0yJzaQtPGZQJy6+gUGfK8sPMAYLNPoBnwa17vOISj1tlOxw9dXIyzl jXUbAU98TfwMjGpw7hRqyxxZP+t9JNfkH5pxhuhyFilnq3pW9I5qVbdJ6wAMAXL4SyBK zSuH8LCG9wBc9hu+f/fDYZDuSKnsmuxVwzEHCWVnhy4+TeBJ6ELuhedzasYrBjRmDlN2 kMbCsC2U9/SPFnguCAQV49mLWfQyGaOk186QnlAIv334seQh+DHvlbnOnEPW96dPEDYT +erDRsxSoeD3xh0gfv2h7ztBiCSF9aoNs6ebE8tXDfPbDbSALO8mS0bJsoKNAbp2wtS/ ywOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=x4yuuS6m1ahEvmnctGXiEwC/JlHXVOzHsSQG4YEbXD4=; b=Raz61hW9TO3sqEAb07eUv3tAHGKySWab4acj5LqFAnsCLCUhiLxlDZngSHRM4x8nUP jMjKmFfykeU9x3BrrnsXPmmZJb3dtTpnX3P2xGMz2mLFHWsiAdHl238Dcp8dyhONtzzP vTWMYTkNdSVmLCKZR8YuUAQzisEx3VrK3zMb79abeRSKNKyH/qVwgs4k2Zd3hPg4MJCc iNw/gEE5H1VB0wzwHTq3ZEO1o0VvnVggNlddprCk+OprYkbY9avNUoTsOyu/if2LRr95 l9wZBjTpIaqL+YTIAFkjD/l5B/28+dOnUxrUsmQEZdEzSxtTADi+H1yrMPQE7QoiS9/G 6Sfg== X-Gm-Message-State: AHPjjUh+S5F/IC1WXOC3kNEJ5oZr2sYe6/5rVtqmQKFkRh06ATtQ6xWh I8hDlWn3mi12OQ== X-Google-Smtp-Source: ADKCNb67Mw5Y1DPL3Dp3bLItsqAl+g/EVjxj25qfqctzwYfQj0sy1tjuHUbvj2ZJ3aEzPYXvN6Tevw== X-Received: by 10.98.193.2 with SMTP id i2mr4117936pfg.207.1504900904557; Fri, 08 Sep 2017 13:01:44 -0700 (PDT) Received: from srishti-PRODiiGY-945G ([171.61.9.172]) by smtp.gmail.com with ESMTPSA id r15sm5172164pfj.41.2017.09.08.13.01.43 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Sep 2017 13:01:44 -0700 (PDT) From: Srishti Sharma To: gilad@benyossef.com Cc: gregkh@linuxfoundation.org, linux-crypto@vger.kernel.org, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, outreachy-kernel@googlegroups.com, Srishti Sharma Subject: [PATCH] Staging: ccree: Merge assignment with return Date: Sat, 9 Sep 2017 01:31:35 +0530 Message-Id: <1504900895-13110-1-git-send-email-srishtishar@gmail.com> X-Mailer: git-send-email 2.7.4 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 Return the return value of a function directly, instead of first saving it in a variable and then returning it. This change was made using the following semantic patch by coccinelle. @@ local idexpression ret; expression e; @@ -ret = +return e; -return ret; Signed-off-by: Srishti Sharma --- drivers/staging/ccree/ssi_aead.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) -- 2.7.4 diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c index 5abe6b2..6bb98f7 100644 --- a/drivers/staging/ccree/ssi_aead.c +++ b/drivers/staging/ccree/ssi_aead.c @@ -651,17 +651,14 @@ ssi_aead_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen) static int ssi_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen) { struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); - int rc = 0; - + if (keylen < 3) return -EINVAL; keylen -= 3; memcpy(ctx->ctr_nonce, key + keylen, 3); - rc = ssi_aead_setkey(tfm, key, keylen); - - return rc; + return ssi_aead_setkey(tfm, key, keylen); } #endif /*SSI_CC_HAS_AES_CCM*/ @@ -2214,8 +2211,7 @@ static int ssi_rfc4309_ccm_decrypt(struct aead_request *req) static int ssi_rfc4106_gcm_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen) { struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); - int rc = 0; - + SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); if (keylen < 4) @@ -2224,16 +2220,13 @@ static int ssi_rfc4106_gcm_setkey(struct crypto_aead *tfm, const u8 *key, unsign keylen -= 4; memcpy(ctx->ctr_nonce, key + keylen, 4); - rc = ssi_aead_setkey(tfm, key, keylen); - - return rc; + return ssi_aead_setkey(tfm, key, keylen); } static int ssi_rfc4543_gcm_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen) { struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm); - int rc = 0; - + SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); if (keylen < 4) @@ -2242,9 +2235,7 @@ static int ssi_rfc4543_gcm_setkey(struct crypto_aead *tfm, const u8 *key, unsign keylen -= 4; memcpy(ctx->ctr_nonce, key + keylen, 4); - rc = ssi_aead_setkey(tfm, key, keylen); - - return rc; + return ssi_aead_setkey(tfm, key, keylen); } static int ssi_gcm_setauthsize(struct crypto_aead *authenc,