Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757340AbdIIG5G (ORCPT ); Sat, 9 Sep 2017 02:57:06 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:28815 "EHLO mail3-relais-sop.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750817AbdIIG5F (ORCPT ); Sat, 9 Sep 2017 02:57:05 -0400 X-IronPort-AV: E=Sophos;i="5.42,365,1500933600"; d="scan'208";a="236858549" Date: Sat, 9 Sep 2017 08:57:03 +0200 (CEST) From: Julia Lawall X-X-Sender: jll@hadrien To: Srishti Sharma cc: Gilad Ben-Yossef , Greg KH , Linux Crypto Mailing List , driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org, Linux kernel mailing list , outreachy-kernel@googlegroups.com Subject: Re: [Outreachy kernel] [PATCH v2] Staging: ccree: Merge assignment with return In-Reply-To: Message-ID: References: <1504904135-3973-1-git-send-email-srishtishar@gmail.com> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4500 Lines: 129 On Sat, 9 Sep 2017, Srishti Sharma wrote: > On Sat, Sep 9, 2017 at 2:28 AM, Julia Lawall wrote: > > > > > > On Sat, 9 Sep 2017, Srishti Sharma wrote: > > > >> Merge the assignment and return statements to return the value > >> directly. Done using coccinelle. > >> > >> @@ > >> local idexpression ret; > >> expression e; > >> @@ > >> > >> -ret = > >> +return > >> e; > >> -return ret; > >> > >> Signed-off-by: Srishti Sharma > >> --- > >> Changes in v2: > >> - Edit commit message so that it respects the 80 character limit. > >> > >> drivers/staging/ccree/ssi_aead.c | 18 ++++++------------ > >> 1 file changed, 6 insertions(+), 12 deletions(-) > >> > >> diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c > >> index 5abe6b2..f4532ea 100644 > >> --- a/drivers/staging/ccree/ssi_aead.c > >> +++ b/drivers/staging/ccree/ssi_aead.c > >> @@ -651,7 +651,7 @@ 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; > >> + > >> > > > > There is still a problem here. You don't need two blank lines under a > > variable declaration. > > When I try to remove that extra blank line it looks like I deleted one > blank line and added another one . It seems odd, but I guess you solved the problem somehow? julia > > Regards, > Srishti > > > > > julia > > > >> if (keylen < 3) > >> return -EINVAL; > >> @@ -659,9 +659,7 @@ static int ssi_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, unsign > >> 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,7 +2212,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); > >> > >> @@ -2224,15 +2222,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); > >> > >> @@ -2242,9 +2238,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, > >> -- > >> 2.7.4 > >> > >> -- > >> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group. > >> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com. > >> To post to this group, send email to outreachy-kernel@googlegroups.com. > >> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1504904135-3973-1-git-send-email-srishtishar%40gmail.com. > >> For more options, visit https://groups.google.com/d/optout. > >> > > -- > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com. > To post to this group, send email to outreachy-kernel@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/CAB3L5oy7pxuTNyQmdnWd6M4_UOJ2mdp7uEOAH9sCMZPt-Suekg%40mail.gmail.com. > For more options, visit https://groups.google.com/d/optout. >