[PATCH] Staging: ccree: Merge assignment with return

[PATCH] Staging: ccree: Merge assignment with return

[Srishti Sharma]

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 <srishtishar@gmail.com>
---
 drivers/staging/ccree/ssi_sysfs.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/ccree/ssi_sysfs.c b/drivers/staging/ccree/ssi_sysfs.c
index 0655658..9fa7be0 100644
--- a/drivers/staging/ccree/ssi_sysfs.c
+++ b/drivers/staging/ccree/ssi_sysfs.c
@@ -412,7 +412,6 @@ static void sys_free_dir(struct sys_dir *sys_dir)

 int ssi_sysfs_init(struct kobject *sys_dev_obj, struct ssi_drvdata *drvdata)
 {
-	int retval;

 #if defined CC_CYCLE_COUNT
 	/* Init. statistics */
@@ -423,10 +422,9 @@ int ssi_sysfs_init(struct kobject *sys_dev_obj, struct ssi_drvdata *drvdata)
 	SSI_LOG_ERR("setup sysfs under %s\n", sys_dev_obj->name);

 	/* Initialize top directory */
-	retval = sys_init_dir(&sys_top_dir, drvdata, sys_dev_obj, "cc_info",
+	return sys_init_dir(&sys_top_dir, drvdata, sys_dev_obj, "cc_info",
 			      ssi_sys_top_level_attrs,
 			      ARRAY_SIZE(ssi_sys_top_level_attrs));
-	return retval;
 }

 void ssi_sysfs_fini(void)
--
2.7.4

Re: [Outreachy kernel] [PATCH] Staging: ccree: Merge assignment with return

[Julia Lawall]

On Sat, 9 Sep 2017, Srishti Sharma wrote:

> Merge the assignment and return statements to return the value
> directly. Done using coccinelle.

Coccinelle is not always perfect about pretty printing, so you have to
watch out for it.

>
> @@
> local idexpression ret;
> expression e;
> @@
>
> -ret =
> +return
>      e;
> -return ret;
>
> Signed-off-by: Srishti Sharma <srishtishar@gmail.com>
> ---
>  drivers/staging/ccree/ssi_sysfs.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/staging/ccree/ssi_sysfs.c b/drivers/staging/ccree/ssi_sysfs.c
> index 0655658..9fa7be0 100644
> --- a/drivers/staging/ccree/ssi_sysfs.c
> +++ b/drivers/staging/ccree/ssi_sysfs.c
> @@ -412,7 +412,6 @@ static void sys_free_dir(struct sys_dir *sys_dir)
>
>  int ssi_sysfs_init(struct kobject *sys_dev_obj, struct ssi_drvdata *drvdata)
>  {
> -	int retval;
>

This is going to leave a single empty line at the top of the function.
That is not needed.

>  #if defined CC_CYCLE_COUNT
>  	/* Init. statistics */
> @@ -423,10 +422,9 @@ int ssi_sysfs_init(struct kobject *sys_dev_obj, struct ssi_drvdata *drvdata)
>  	SSI_LOG_ERR("setup sysfs under %s\n", sys_dev_obj->name);
>
>  	/* Initialize top directory */
> -	retval = sys_init_dir(&sys_top_dir, drvdata, sys_dev_obj, "cc_info",
> +	return sys_init_dir(&sys_top_dir, drvdata, sys_dev_obj, "cc_info",
>  			      ssi_sys_top_level_attrs,
>  			      ARRAY_SIZE(ssi_sys_top_level_attrs));

Previously the arguments were lined up with the right side of the ( but
now they are not.  So move the above two lines to the left by 2 spaces.

julia

> -	return retval;
>  }
>
>  void ssi_sysfs_fini(void)
> --
> 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 outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1504953861-3221-1-git-send-email-srishtishar%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>

Re: [Outreachy kernel] [PATCH] Staging: ccree: Merge assignment with return

[Srishti Sharma]

On Sat, Sep 9, 2017 at 10:29 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
>
>
> On Sat, 9 Sep 2017, Srishti Sharma wrote:
>
>> Merge the assignment and return statements to return the value
>> directly. Done using coccinelle.
>
> Coccinelle is not always perfect about pretty printing, so you have to
> watch out for it.
>
>>
>> @@
>> local idexpression ret;
>> expression e;
>> @@
>>
>> -ret =
>> +return
>>      e;
>> -return ret;
>>
>> Signed-off-by: Srishti Sharma <srishtishar@gmail.com>
>> ---
>>  drivers/staging/ccree/ssi_sysfs.c | 4 +---
>>  1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/drivers/staging/ccree/ssi_sysfs.c b/drivers/staging/ccree/ssi_sysfs.c
>> index 0655658..9fa7be0 100644
>> --- a/drivers/staging/ccree/ssi_sysfs.c
>> +++ b/drivers/staging/ccree/ssi_sysfs.c
>> @@ -412,7 +412,6 @@ static void sys_free_dir(struct sys_dir *sys_dir)
>>
>>  int ssi_sysfs_init(struct kobject *sys_dev_obj, struct ssi_drvdata *drvdata)
>>  {
>> -     int retval;
>>
>
> This is going to leave a single empty line at the top of the function.
> That is not needed.
>
>>  #if defined CC_CYCLE_COUNT
>>       /* Init. statistics */
>> @@ -423,10 +422,9 @@ int ssi_sysfs_init(struct kobject *sys_dev_obj, struct ssi_drvdata *drvdata)
>>       SSI_LOG_ERR("setup sysfs under %s\n", sys_dev_obj->name);
>>
>>       /* Initialize top directory */
>> -     retval = sys_init_dir(&sys_top_dir, drvdata, sys_dev_obj, "cc_info",
>> +     return sys_init_dir(&sys_top_dir, drvdata, sys_dev_obj, "cc_info",
>>                             ssi_sys_top_level_attrs,
>>                             ARRAY_SIZE(ssi_sys_top_level_attrs));
>
> Previously the arguments were lined up with the right side of the ( but
> now they are not.  So move the above two lines to the left by 2 spaces.

Thanks for this , I have re-sent the patch .

Regards,
Srishti

> julia
>
>> -     return retval;
>>  }
>>
>>  void ssi_sysfs_fini(void)
>> --
>> 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 outreachy-kernel+unsubscribe@googlegroups.com.
>> To post to this group, send email to outreachy-kernel@googlegroups.com.
>> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1504953861-3221-1-git-send-email-srishtishar%40gmail.com.
>> For more options, visit https://groups.google.com/d/optout.
>>

[PATCH] Staging: ccree: Merge assignment with return

[Srishti Sharma]

Return the return value of a function directly, instead of first saving it in a variable and then returning it. This change was made using the following
semantic patch by coccinelle.

@@
local idexpression ret;
expression e;
@@

-ret =
+return
     e;
-return ret;

Signed-off-by: Srishti Sharma <srishtishar@gmail.com>
---
 drivers/staging/ccree/ssi_aead.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c
index 5abe6b2..6bb98f7 100644
--- a/drivers/staging/ccree/ssi_aead.c
+++ b/drivers/staging/ccree/ssi_aead.c
@@ -651,17 +651,14 @@ 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;

 	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,8 +2211,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);

 	if (keylen < 4)
@@ -2224,16 +2220,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);

 	if (keylen < 4)
@@ -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,
--
2.7.4