Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1557075 > unrolled thread

[PATCH] drivers: power: supply: Compress return logic into one line.

Started by"Gustavo A. R. Silva" <silvagustavosilva@gmail.com>
First post2017-01-12 03:50 +0100
Last post2017-01-20 00:00 +0100
Articles 3 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] drivers: power: supply: Compress return logic into one line. "Gustavo A. R. Silva" <silvagustavosilva@gmail.com> - 2017-01-12 03:50 +0100
    Re: [PATCH] drivers: power: supply: Compress return logic into one  line. Sebastian Reichel <sre@kernel.org> - 2017-01-17 00:50 +0100
      Re: [PATCH] drivers: power: supply: Compress return logic into one  line. "Gustavo A. R. Silva" <garsilva@embeddedor.com> - 2017-01-20 00:00 +0100

#1557075 — [PATCH] drivers: power: supply: Compress return logic into one line.

From"Gustavo A. R. Silva" <silvagustavosilva@gmail.com>
Date2017-01-12 03:50 +0100
Subject[PATCH] drivers: power: supply: Compress return logic into one line.
Message-ID<sYDCF-6E0-1@gated-at.bofh.it>
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 <garsilva@embeddedor.com>
---
 drivers/power/supply/pcf50633-charger.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/power/supply/pcf50633-charger.c b/drivers/power/supply/pcf50633-charger.c
index d05597b..b3c1873 100644
--- a/drivers/power/supply/pcf50633-charger.c
+++ b/drivers/power/supply/pcf50633-charger.c
@@ -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);
-- 
2.5.0

[toc] | [next] | [standalone]

#1560171 — Re: [PATCH] drivers: power: supply: Compress return logic into one line.

FromSebastian Reichel <sre@kernel.org>
Date2017-01-17 00:50 +0100
SubjectRe: [PATCH] drivers: power: supply: Compress return logic into one line.
Message-ID<t0pcd-7IE-5@gated-at.bofh.it>
In reply to#1557075

[Multipart message — attachments visible in raw view] — view raw

Hi,

On Wed, Jan 11, 2017 at 08:45:57PM -0600, Gustavo A. R. Silva wrote:
> 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 <garsilva@embeddedor.com>
> ---
>  drivers/power/supply/pcf50633-charger.c | 13 ++++---------
>  1 file changed, 4 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/power/supply/pcf50633-charger.c b/drivers/power/supply/pcf50633-charger.c
> index d05597b..b3c1873 100644
> --- a/drivers/power/supply/pcf50633-charger.c
> +++ b/drivers/power/supply/pcf50633-charger.c
> @@ -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);

Thanks, queued.

-- Sebastian

[toc] | [prev] | [next] | [standalone]

#1563181 — Re: [PATCH] drivers: power: supply: Compress return logic into one line.

From"Gustavo A. R. Silva" <garsilva@embeddedor.com>
Date2017-01-20 00:00 +0100
SubjectRe: [PATCH] drivers: power: supply: Compress return logic into one line.
Message-ID<t1tQt-7A8-9@gated-at.bofh.it>
In reply to#1560171
Hey hello,

Quoting Sebastian Reichel <sre@kernel.org>:

> Hi,
>
> On Wed, Jan 11, 2017 at 08:45:57PM -0600, Gustavo A. R. Silva wrote:
>> 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 <garsilva@embeddedor.com>
>> ---
>>  drivers/power/supply/pcf50633-charger.c | 13 ++++---------
>>  1 file changed, 4 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/power/supply/pcf50633-charger.c  
>> b/drivers/power/supply/pcf50633-charger.c
>> index d05597b..b3c1873 100644
>> --- a/drivers/power/supply/pcf50633-charger.c
>> +++ b/drivers/power/supply/pcf50633-charger.c
>> @@ -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);
>
> Thanks, queued.
>

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web