Staging: ccree: Merge assignment with return

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c
index 8191ec43f72dc86b37819edb9c561d30d753ac29..d09da280e48ab7c9ba6606e67b56d82631917c60 100644 (file)
--- a/drivers/staging/ccree/ssi_aead.c
+++ b/drivers/staging/ccree/ssi_aead.c
@@ -651,7 +651,6 @@ setkey_error:
 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 @@ out:
 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,