UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Srishti Sharma 2017-09-09 13:18:51 +05:30 committed by Greg Kroah-Hartman
parent 9ba7bdc9d9
commit 63fcb0ce01
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/ccree/ssi_aead.c
View File

@ -651,7 +651,6 @@ setkey_error:
static int ssi_rfc4309_ccm_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); struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
int rc = 0;
if (keylen < 3) if (keylen < 3)
return -EINVAL; return -EINVAL;
@ -659,9 +658,7 @@ static int ssi_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, unsign
keylen -= 3; keylen -= 3;
memcpy(ctx->ctr_nonce, key + keylen, 3); memcpy(ctx->ctr_nonce, key + keylen, 3);
rc = ssi_aead_setkey(tfm, key, keylen); return ssi_aead_setkey(tfm, key, keylen);
return rc;
} }
#endif /*SSI_CC_HAS_AES_CCM*/ #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) 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); struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
int rc = 0;
SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); 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; keylen -= 4;
memcpy(ctx->ctr_nonce, key + keylen, 4); memcpy(ctx->ctr_nonce, key + keylen, 4);
rc = ssi_aead_setkey(tfm, key, keylen); return ssi_aead_setkey(tfm, key, keylen);
return rc;
} }
static int ssi_rfc4543_gcm_setkey(struct crypto_aead *tfm, const u8 *key, unsigned int 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); struct ssi_aead_ctx *ctx = crypto_aead_ctx(tfm);
int rc = 0;
SSI_LOG_DEBUG("%s() keylen %d, key %p\n", __func__, keylen, key); 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; keylen -= 4;
memcpy(ctx->ctr_nonce, key + keylen, 4); memcpy(ctx->ctr_nonce, key + keylen, 4);
rc = ssi_aead_setkey(tfm, key, keylen); return ssi_aead_setkey(tfm, key, keylen);
return rc;
} }
static int ssi_gcm_setauthsize(struct crypto_aead *authenc, static int ssi_gcm_setauthsize(struct crypto_aead *authenc,