2017-09-09 10:44:29

by Srishti Sharma

Subject: [PATCH] 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]>
---
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

2017-09-09 16:59:48

by Julia Lawall

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

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

2017-09-10 05:52:16

by Srishti Sharma

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

On Sat, Sep 9, 2017 at 10:29 PM, Julia Lawall <[email protected]> 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 <[email protected]>
>> ---
>> 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 [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/1504953861-3221-1-git-send-email-srishtishar%40gmail.com.
>> For more options, visit https://groups.google.com/d/optout.
>>