Staging: ccree: Merge assignment with return

PATCH Superseded Srishti Sharma 2 participants 5 messages Sep 8, 2017 – Sep 9, 2017

Subsystems (2)

Staging Crypto API

lore

Share & tools

lore

Srishti Sharma

author

2017-09-08 20:55 UTC #0 lore raw

PATCH v2 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;

Signed-off-by Srishti Sharma <[email protected]>

---
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(-)

drivers/staging/ccree/ssi_aead.c +6 ~~-12~~

index 5abe6b2..f4532ea 100644
@@ -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;
+
 
 	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

Julia Lawall

2017-09-08 20:58 UTC #1 lore raw

Quoted 26 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 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(-)
drivers/staging/ccree/ssi_aead.c +0 -0
index 5abe6b2..f4532ea 100644

drivers/staging/ccree/ssi_aead.c ssi_aead_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen) · line 655

Quoted 6 lines

drivers/staging/ccree/ssi_aead.c +1 -1

@@ -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.

julia

Quoted 61 lines

drivers/staging/ccree/ssi_aead.c +5 ~~-12~~

 	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 [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/1504904135-3973-1-git-send-email-srishtishar%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

Srishti Sharma

author

2017-09-08 21:15 UTC #2 lore raw

Quoted 25 lines · Julia Lawall

Quoted 21 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 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(-)

Quoted 14 lines

drivers/staging/ccree/ssi_aead.c ssi_aead_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen) · line 655
Quoted 11 lines
drivers/staging/ccree/ssi_aead.c +1 -1
index 5abe6b2..f4532ea 100644
@@ -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 .

Regards,
Srishti

Quoted 64 lines

julia

Quoted 61 lines

drivers/staging/ccree/ssi_aead.c +5 ~~-12~~

      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

Julia Lawall

2017-09-09 06:57 UTC #3 lore raw

Quoted 41 lines · Srishti Sharma

Quoted 25 lines · Julia Lawall
Quoted 21 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 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(-)
Quoted 14 lines
drivers/staging/ccree/ssi_aead.c ssi_aead_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen) · line 655
Quoted 11 lines
drivers/staging/ccree/ssi_aead.c +1 -1
index 5abe6b2..f4532ea 100644
@@ -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.

Quoted 2 lines

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

Quoted 76 lines

Regards,
Srishti
Quoted 57 lines
julia
Quoted 54 lines
drivers/staging/ccree/ssi_aead.c +5 ~~-12~~
      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
Quoted 7 lines
Quoted 7 lines
--
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/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 [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/CAB3L5oy7pxuTNyQmdnWd6M4_UOJ2mdp7uEOAH9sCMZPt-Suekg%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

Srishti Sharma

author

2017-09-09 07:08 UTC #4 lore raw

Quoted 45 lines · Julia Lawall

Quoted 41 lines · Srishti Sharma
Quoted 39 lines · Julia Lawall
Quoted 26 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 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(-)
drivers/staging/ccree/ssi_aead.c +0 -0
index 5abe6b2..f4532ea 100644
drivers/staging/ccree/ssi_aead.c ssi_aead_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen) · line 655
Quoted 6 lines
drivers/staging/ccree/ssi_aead.c +1 -1
@@ -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.

Quoted 4 lines

Quoted 2 lines
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?

Yes, I was making a mistake .

Regards,
Srishti

Quoted 79 lines

julia
Quoted 76 lines
Regards,
Srishti
Quoted 57 lines
julia
Quoted 54 lines
drivers/staging/ccree/ssi_aead.c +5 ~~-12~~
      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
Quoted 7 lines
Quoted 7 lines
--
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/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 [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/CAB3L5oy7pxuTNyQmdnWd6M4_UOJ2mdp7uEOAH9sCMZPt-Suekg%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.