Staging: ccree: Merge assignment with return
Subsystems (2)
PATCH v3 1/1 Staging: ccree: Merge assignment with return
Merge the assignment and return statements to return the value directly. Done using coccinelle.
@@
local idexpression ret;
expression e;
@@
-ret =
+return
e;
-return ret;
---
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(-)
drivers/staging/ccree/ssi_aead.c +3 -11
@@ -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); }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
Quoted 46 lines · Srishti Sharma
Merge the assignment and return statements to return the value directly. Done using coccinelle.
@@
local idexpression ret;
expression e;
@@(quoted diff) +1
-2-ret = +return e; -return ret;Signed-off-by Srishti Sharma <[email protected]>---
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(-)drivers/staging/ccree/ssi_aead.c +1
-4@@ -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*/
drivers/staging/ccree/ssi_aead.c static int ssi_rfc4106_gcm_setkey(struct crypto_aead *tfm, const u8 *key, unsign · line 2224
Quoted 7 lines
drivers/staging/ccree/ssi_aead.c +1
-3@@ -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.
julia
Quoted 30 lines
drivers/staging/ccree/ssi_aead.c +1
-5}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 [email protected]. To post to this group, send email to [email protected].
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.
Quoted 53 lines · Julia Lawall
Quoted 49 lines · Srishti Sharma
Merge the assignment and return statements to return the value directly. Done using coccinelle.
@@
local idexpression ret;
expression e;
@@(quoted diff) +1
-2-ret = +return e; -return ret;Signed-off-by Srishti Sharma <[email protected]>---
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(-)drivers/staging/ccree/ssi_aead.c +1
-4@@ -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 );
Quoted 8 lines
drivers/staging/ccree/ssi_aead.c static int ssi_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, unsign · line 661
Quoted 4 lines
drivers/staging/ccree/ssi_aead.c +1
-3- 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
Quoted 32 lines
julia
Quoted 30 lines
drivers/staging/ccree/ssi_aead.c +1
-5}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 [email protected]. To post to this group, send email to [email protected].
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.