Patchwork [v2] Staging: ccree: Merge assignment with return

login
register
mail settings
Submitter srishti
Date Sept. 10, 2017, 5:35 a.m.
Message ID <1505021737-4674-1-git-send-email-srishtishar@gmail.com>
Download mbox | patch
Permalink /patch/9946161/
State Not Applicable
Delegated to: Herbert Xu
Headers show

Comments

srishti - Sept. 10, 2017, 5:35 a.m.
Merge the assignment and return statements to return the value
directly. Done 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>
---
Changes in v2:
 -Correct coding style problems

 drivers/staging/ccree/ssi_sysfs.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

--
2.7.4

Patch

diff --git a/drivers/staging/ccree/ssi_sysfs.c b/drivers/staging/ccree/ssi_sysfs.c
index 0655658..ed662cb 100644
--- a/drivers/staging/ccree/ssi_sysfs.c
+++ b/drivers/staging/ccree/ssi_sysfs.c
@@ -412,8 +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 */
 	init_db(stat_host_db);
@@ -423,10 +421,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",
-			      ssi_sys_top_level_attrs,
-			      ARRAY_SIZE(ssi_sys_top_level_attrs));
-	return retval;
+	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));
 }

 void ssi_sysfs_fini(void)