drivers: power: supply: Compress return logic into one line.

PATCH In review Gustavo A. R. Silva 3 participants 3 messages Jan 12, 2017 – Jan 19, 2017 Power supply

Share & tools

Gustavo A. R. Silva

author

2017-01-12 02:46 UTC #0 lore raw

PATCH 1/1 drivers: power: supply: Compress return logic into one line.

Simplify return logic to avoid unnecessary variable assignments. These issues were detected using Coccinelle and the following semantic patch:

@@
local idexpression ret;
expression e;
@@

-ret =
+return

e;

-return ret;

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
 drivers/power/supply/pcf50633-charger.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

drivers/power/supply/pcf50633-charger.c +4 -9

index d05597b..b3c1873 100644
@@ -393,7 +393,6 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
 {
 	struct power_supply_config psy_cfg = {};
 	struct pcf50633_mbc *mbc;
-	int ret;
 	int i;
 	u8 mbcs1;

@@ -419,8 +418,7 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
 					     &psy_cfg);
 	if (IS_ERR(mbc->adapter)) {
 		dev_err(mbc->pcf->dev, "failed to register adapter\n");
-		ret = PTR_ERR(mbc->adapter);
-		return ret;
+		return PTR_ERR(mbc->adapter);
 	}
 
 	mbc->usb = power_supply_register(&pdev->dev, &pcf50633_mbc_usb_desc,

@@ -428,8 +426,7 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
 	if (IS_ERR(mbc->usb)) {
 		dev_err(mbc->pcf->dev, "failed to register usb\n");
 		power_supply_unregister(mbc->adapter);
-		ret = PTR_ERR(mbc->usb);
-		return ret;
+		return PTR_ERR(mbc->usb);
 	}
 
 	mbc->ac = power_supply_register(&pdev->dev, &pcf50633_mbc_ac_desc,

@@ -438,12 +435,10 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
 		dev_err(mbc->pcf->dev, "failed to register ac\n");
 		power_supply_unregister(mbc->adapter);
 		power_supply_unregister(mbc->usb);
-		ret = PTR_ERR(mbc->ac);
-		return ret;
+		return PTR_ERR(mbc->ac);
 	}
 
-	ret = sysfs_create_group(&pdev->dev.kobj, &mbc_attr_group);
-	if (ret)
+	if (sysfs_create_group(&pdev->dev.kobj, &mbc_attr_group))
 		dev_err(mbc->pcf->dev, "failed to create sysfs entries\n");
 
 	mbcs1 = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCS1);

Signature · 1 line

2.5.0

Sebastian Reichel

maintainer

2017-01-16 23:42 UTC #1 lore raw

Hi,

Quoted 55 lines · Gustavo A. R. Silva

Simplify return logic to avoid unnecessary variable assignments. These issues were detected using Coccinelle and the following semantic patch:

@@
local idexpression ret;
expression e;
@@

(quoted diff) +1 -2

-ret =
+return
     e;
-return ret;

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
 drivers/power/supply/pcf50633-charger.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

drivers/power/supply/pcf50633-charger.c +2 -6

index d05597b..b3c1873 100644
@@ -393,7 +393,6 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
 {
 	struct power_supply_config psy_cfg = {};
 	struct pcf50633_mbc *mbc;
-	int ret;
 	int i;
 	u8 mbcs1;

@@ -419,8 +418,7 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
 					     &psy_cfg);
 	if (IS_ERR(mbc->adapter)) {
 		dev_err(mbc->pcf->dev, "failed to register adapter\n");
-		ret = PTR_ERR(mbc->adapter);
-		return ret;
+		return PTR_ERR(mbc->adapter);
 	}
 
 	mbc->usb = power_supply_register(&pdev->dev, &pcf50633_mbc_usb_desc,

@@ -428,8 +426,7 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
 	if (IS_ERR(mbc->usb)) {
 		dev_err(mbc->pcf->dev, "failed to register usb\n");
 		power_supply_unregister(mbc->adapter);
-		ret = PTR_ERR(mbc->usb);
-		return ret;
+		return PTR_ERR(mbc->usb);
 	}
 
 	mbc->ac = power_supply_register(&pdev->dev, &pcf50633_mbc_ac_desc,

@@ -438,12 +435,10 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
 		dev_err(mbc->pcf->dev, "failed to register ac\n");
 		power_supply_unregister(mbc->adapter);
 		power_supply_unregister(mbc->usb);
-		ret = PTR_ERR(mbc->ac);

drivers/power/supply/pcf50633-charger.c static int pcf50633_mbc_probe(struct platform_device *pdev) · line 444

Quoted 10 lines

drivers/power/supply/pcf50633-charger.c +2 -3

-		return ret;
+		return PTR_ERR(mbc->ac);
 	}
 
-	ret = sysfs_create_group(&pdev->dev.kobj, &mbc_attr_group);
-	if (ret)
+	if (sysfs_create_group(&pdev->dev.kobj, &mbc_attr_group))
 		dev_err(mbc->pcf->dev, "failed to create sysfs entries\n");
 
 	mbcs1 = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCS1);

Thanks, queued.

-- Sebastian

Gustavo A. R. Silva

2017-01-19 22:47 UTC #2 lore raw

Hey hello,

Quoting Sebastian Reichel <[email protected]>:

Quoted 66 lines

Hi,

Quoted 63 lines · Gustavo A. R. Silva

Simplify return logic to avoid unnecessary variable assignments. These issues were detected using Coccinelle and the following semantic patch:

@@
local idexpression ret;
expression e;
@@

(quoted diff) +1 -2

-ret =
+return
     e;
-return ret;

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
 drivers/power/supply/pcf50633-charger.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

drivers/power/supply/pcf50633-charger.c +1 -3

index d05597b..b3c1873 100644
@@ -393,7 +393,6 @@ static int pcf50633_mbc_probe(struct  
 platform_device *pdev)
 {
 	struct power_supply_config psy_cfg = {};
 	struct pcf50633_mbc *mbc;
-	int ret;
 	int i;
 	u8 mbcs1;

@@ -419,8 +418,7 @@ static int pcf50633_mbc_probe(struct  
 platform_device *pdev)
 					     &psy_cfg);
 	if (IS_ERR(mbc->adapter)) {
 		dev_err(mbc->pcf->dev, "failed to register adapter\n");
-		ret = PTR_ERR(mbc->adapter);
-		return ret;
+		return PTR_ERR(mbc->adapter);
 	}

drivers/power/supply/pcf50633-charger.c +1 -2

 	mbc->usb = power_supply_register(&pdev->dev, &pcf50633_mbc_usb_desc,

@@ -428,8 +426,7 @@ static int pcf50633_mbc_probe(struct  
 platform_device *pdev)
 	if (IS_ERR(mbc->usb)) {
 		dev_err(mbc->pcf->dev, "failed to register usb\n");
 		power_supply_unregister(mbc->adapter);
-		ret = PTR_ERR(mbc->usb);
-		return ret;
+		return PTR_ERR(mbc->usb);
 	}

drivers/power/supply/pcf50633-charger.c +1 -2

 	mbc->ac = power_supply_register(&pdev->dev, &pcf50633_mbc_ac_desc,

@@ -438,12 +435,10 @@ static int pcf50633_mbc_probe(struct  
 platform_device *pdev)
 		dev_err(mbc->pcf->dev, "failed to register ac\n");
 		power_supply_unregister(mbc->adapter);
 		power_supply_unregister(mbc->usb);
-		ret = PTR_ERR(mbc->ac);
-		return ret;
+		return PTR_ERR(mbc->ac);
 	}

Quoted 9 lines

Quoted 6 lines
drivers/power/supply/pcf50633-charger.c +1 -2
-	ret = sysfs_create_group(&pdev->dev.kobj, &mbc_attr_group);
-	if (ret)
+	if (sysfs_create_group(&pdev->dev.kobj, &mbc_attr_group))
 		dev_err(mbc->pcf->dev, "failed to create sysfs entries\n");
 
mbcs1 = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCS1);
Thanks, queued.

Awesome, thanks!
--
Gustavo A. R. Silva