From: Srishti Sharma Subject: Re: [Outreachy kernel] [PATCH v3] Staging: ccree: Merge assignment with return Date: Sat, 9 Sep 2017 14:05:32 +0530 Message-ID: References: <1504907654-4914-1-git-send-email-srishtishar@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: devel@driverdev.osuosl.org, outreachy-kernel@googlegroups.com, Greg KH , driverdev-devel@linuxdriverproject.org, Linux kernel mailing list , Linux Crypto Mailing List To: Julia Lawall Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" List-Id: linux-crypto.vger.kernel.org On Sat, Sep 9, 2017 at 12:26 PM, 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 v3: >> -Edit commit message so that it respects 80 character limit. >> -Remove unneeded blank lines, that were added by mistake. >> >> drivers/staging/ccree/ssi_aead.c | 14 +++----------- >> 1 file changed, 3 insertions(+), 11 deletions(-) >> >> diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c >> index 5abe6b2..1d3b580 100644 >> --- a/drivers/staging/ccree/ssi_aead.c >> +++ b/drivers/staging/ccree/ssi_aead.c >> @@ -651,7 +651,6 @@ 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; >> @@ -659,9 +658,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*/ >> >> @@ -2224,15 +2221,12 @@ 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); > > The declaration of rc should be dropped in this case. You should have > gotten a compiler warning. Always compile the code before submitting a > patch, and fix up any warnings. I am very sorry about that, I have re-sent it. Regards, Srishti > julia > >> } >> >> 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 +2236,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/1504907654-4914-1-git-send-email-srishtishar%40gmail.com. >> For more options, visit https://groups.google.com/d/optout. >>