Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63fcb0ce authored by Srishti Sharma's avatar Srishti Sharma Committed by Greg Kroah-Hartman
Browse files

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: default avatarSrishti Sharma <srishtishar@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ba7bdc9

drivers/staging/ccree/ssi_aead.c

+3 −12
Original line number Diff line number Diff line
@@ -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,