| Message ID | 1504943331-4636-1-git-send-email-srishtishar@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
On Sat, 9 Sep 2017, Srishti Sharma wrote: > Merge the assignment and the 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 <srishtishar@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> > --- > Changes in v4: > -Edit commit message so that it respects 80 character limit > -Remove unneeded blank lines > -Remove declarations of variables that are not used > > drivers/staging/ccree/ssi_aead.c | 15 +++------------ > 1 file changed, 3 insertions(+), 12 deletions(-) > > diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c > index 5abe6b2..84fcb75 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*/ > > @@ -2214,7 +2211,6 @@ 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 +2220,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); > } > > 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 +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, > -- > 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/1504943331-4636-1-git-send-email-srishtishar%40gmail.com. > For more options, visit https://groups.google.com/d/optout. >
diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c index 5abe6b2..84fcb75 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*/ @@ -2214,7 +2211,6 @@ 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 +2220,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); } 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 +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,
Merge the assignment and the 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 <srishtishar@gmail.com> --- Changes in v4: -Edit commit message so that it respects 80 character limit -Remove unneeded blank lines -Remove declarations of variables that are not used drivers/staging/ccree/ssi_aead.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) -- 2.7.4