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;
@@

(quoted diff) +1 -2

-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(-)

drivers/staging/ccree/ssi_sysfs.c +0 -0

index 0655658..9fa7be0 100644

drivers/staging/ccree/ssi_sysfs.c +0 -2

-	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.

Quoted 2 lines · Srishti Sharma

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.

Quoted 21 lines

@@
local idexpression ret;
expression e;
@@

(quoted diff) +1 -2

-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(-)

drivers/staging/ccree/ssi_sysfs.c +0 -0

index 0655658..9fa7be0 100644

drivers/staging/ccree/ssi_sysfs.c static void sys_free_dir(struct sys_dir *sys_dir) · line 415

Quoted 5 lines

drivers/staging/ccree/ssi_sysfs.c +0 -1

@@ -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.

Quoted 5 lines

drivers/staging/ccree/ssi_sysfs.c +0 -0

 #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);
 

drivers/staging/ccree/ssi_sysfs.c int ssi_sysfs_init(struct kobject *sys_dev_obj, struct ssi_drvdata *drvdata) · line 427

Quoted 5 lines

drivers/staging/ccree/ssi_sysfs.c +1 -1

      /* 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

Quoted 14 lines

drivers/staging/ccree/ssi_sysfs.c +0 -2

-     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.