* [PATCH] drivers: power: supply: Compress return logic into one line.
@ 2017-01-12 2:29 Gustavo A. R. Silva
2017-01-16 23:42 ` Sebastian Reichel
0 siblings, 1 reply; 6+ messages in thread
From: Gustavo A. R. Silva @ 2017-01-12 2:29 UTC (permalink / raw)
To: sre; +Cc: linux-pm, linux-kernel
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/ab8500_btemp.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/power/supply/ab8500_btemp.c b/drivers/power/supply/ab8500_btemp.c
index 6ffdc18..9b01b52 100644
--- a/drivers/power/supply/ab8500_btemp.c
+++ b/drivers/power/supply/ab8500_btemp.c
@@ -123,10 +123,7 @@ static LIST_HEAD(ab8500_btemp_list);
*/
struct ab8500_btemp *ab8500_btemp_get(void)
{
- struct ab8500_btemp *btemp;
- btemp = list_first_entry(&ab8500_btemp_list, struct ab8500_btemp, node);
-
- return btemp;
+ return list_first_entry(&ab8500_btemp_list, struct ab8500_btemp, node);
}
EXPORT_SYMBOL(ab8500_btemp_get);
@@ -470,7 +467,7 @@ static int ab8500_btemp_get_batctrl_res(struct ab8500_btemp *di)
static int ab8500_btemp_res_to_temp(struct ab8500_btemp *di,
const struct abx500_res_to_temp *tbl, int tbl_size, int res)
{
- int i, temp;
+ int i;
/*
* Calculate the formula for the straight line
* Simple interpolation if we are within
@@ -488,9 +485,8 @@ static int ab8500_btemp_res_to_temp(struct ab8500_btemp *di,
i++;
}
- temp = tbl[i].temp + ((tbl[i + 1].temp - tbl[i].temp) *
+ return tbl[i].temp + ((tbl[i + 1].temp - tbl[i].temp) *
(res - tbl[i].resist)) / (tbl[i + 1].resist - tbl[i].resist);
- return temp;
}
/**
--
2.5.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] drivers: power: supply: Compress return logic into one line.
2017-01-12 2:29 [PATCH] drivers: power: supply: Compress return logic into one line Gustavo A. R. Silva
@ 2017-01-16 23:42 ` Sebastian Reichel
2017-01-19 22:24 ` Gustavo A. R. Silva
0 siblings, 1 reply; 6+ messages in thread
From: Sebastian Reichel @ 2017-01-16 23:42 UTC (permalink / raw)
To: Gustavo A. R. Silva; +Cc: linux-pm, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1852 bytes --]
Hi,
On Wed, Jan 11, 2017 at 08:29:35PM -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/ab8500_btemp.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/power/supply/ab8500_btemp.c b/drivers/power/supply/ab8500_btemp.c
> index 6ffdc18..9b01b52 100644
> --- a/drivers/power/supply/ab8500_btemp.c
> +++ b/drivers/power/supply/ab8500_btemp.c
> @@ -123,10 +123,7 @@ static LIST_HEAD(ab8500_btemp_list);
> */
> struct ab8500_btemp *ab8500_btemp_get(void)
> {
> - struct ab8500_btemp *btemp;
> - btemp = list_first_entry(&ab8500_btemp_list, struct ab8500_btemp, node);
> -
> - return btemp;
> + return list_first_entry(&ab8500_btemp_list, struct ab8500_btemp, node);
> }
> EXPORT_SYMBOL(ab8500_btemp_get);
>
> @@ -470,7 +467,7 @@ static int ab8500_btemp_get_batctrl_res(struct ab8500_btemp *di)
> static int ab8500_btemp_res_to_temp(struct ab8500_btemp *di,
> const struct abx500_res_to_temp *tbl, int tbl_size, int res)
> {
> - int i, temp;
> + int i;
> /*
> * Calculate the formula for the straight line
> * Simple interpolation if we are within
> @@ -488,9 +485,8 @@ static int ab8500_btemp_res_to_temp(struct ab8500_btemp *di,
> i++;
> }
>
> - temp = tbl[i].temp + ((tbl[i + 1].temp - tbl[i].temp) *
> + return tbl[i].temp + ((tbl[i + 1].temp - tbl[i].temp) *
> (res - tbl[i].resist)) / (tbl[i + 1].resist - tbl[i].resist);
> - return temp;
> }
>
> /**
Thanks, queued.
-- Sebastian
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drivers: power: supply: Compress return logic into one line.
2017-01-16 23:42 ` Sebastian Reichel
@ 2017-01-19 22:24 ` Gustavo A. R. Silva
0 siblings, 0 replies; 6+ messages in thread
From: Gustavo A. R. Silva @ 2017-01-19 22:24 UTC (permalink / raw)
To: Sebastian Reichel; +Cc: linux-pm, linux-kernel
Hey hello,
Quoting Sebastian Reichel <sre@kernel.org>:
> Hi,
>
> On Wed, Jan 11, 2017 at 08:29:35PM -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/ab8500_btemp.c | 10 +++-------
>> 1 file changed, 3 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/power/supply/ab8500_btemp.c
>> b/drivers/power/supply/ab8500_btemp.c
>> index 6ffdc18..9b01b52 100644
>> --- a/drivers/power/supply/ab8500_btemp.c
>> +++ b/drivers/power/supply/ab8500_btemp.c
>> @@ -123,10 +123,7 @@ static LIST_HEAD(ab8500_btemp_list);
>> */
>> struct ab8500_btemp *ab8500_btemp_get(void)
>> {
>> - struct ab8500_btemp *btemp;
>> - btemp = list_first_entry(&ab8500_btemp_list, struct ab8500_btemp, node);
>> -
>> - return btemp;
>> + return list_first_entry(&ab8500_btemp_list, struct ab8500_btemp, node);
>> }
>> EXPORT_SYMBOL(ab8500_btemp_get);
>>
>> @@ -470,7 +467,7 @@ static int ab8500_btemp_get_batctrl_res(struct
>> ab8500_btemp *di)
>> static int ab8500_btemp_res_to_temp(struct ab8500_btemp *di,
>> const struct abx500_res_to_temp *tbl, int tbl_size, int res)
>> {
>> - int i, temp;
>> + int i;
>> /*
>> * Calculate the formula for the straight line
>> * Simple interpolation if we are within
>> @@ -488,9 +485,8 @@ static int ab8500_btemp_res_to_temp(struct
>> ab8500_btemp *di,
>> i++;
>> }
>>
>> - temp = tbl[i].temp + ((tbl[i + 1].temp - tbl[i].temp) *
>> + return tbl[i].temp + ((tbl[i + 1].temp - tbl[i].temp) *
>> (res - tbl[i].resist)) / (tbl[i + 1].resist - tbl[i].resist);
>> - return temp;
>> }
>>
>> /**
>
> Thanks, queued.
>
Awesome, thanks!
--
Gustavo A. R. Silva
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drivers: power: supply: Compress return logic into one line.
2017-01-16 23:42 ` Sebastian Reichel
@ 2017-01-19 22:25 ` Gustavo A. R. Silva
0 siblings, 0 replies; 6+ messages in thread
From: Gustavo A. R. Silva @ 2017-01-19 22:25 UTC (permalink / raw)
To: Sebastian Reichel; +Cc: linux-pm, linux-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drivers: power: supply: Compress return logic into one line.
2017-01-12 2:45 Gustavo A. R. Silva
@ 2017-01-16 23:42 ` Sebastian Reichel
2017-01-19 22:25 ` Gustavo A. R. Silva
0 siblings, 1 reply; 6+ messages in thread
From: Sebastian Reichel @ 2017-01-16 23:42 UTC (permalink / raw)
To: Gustavo A. R. Silva; +Cc: linux-pm, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2360 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] drivers: power: supply: Compress return logic into one line.
@ 2017-01-12 2:45 Gustavo A. R. Silva
2017-01-16 23:42 ` Sebastian Reichel
0 siblings, 1 reply; 6+ messages in thread
From: Gustavo A. R. Silva @ 2017-01-12 2:45 UTC (permalink / raw)
To: sre; +Cc: linux-pm, linux-kernel
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-19 23:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-12 2:29 [PATCH] drivers: power: supply: Compress return logic into one line Gustavo A. R. Silva
2017-01-16 23:42 ` Sebastian Reichel
2017-01-19 22:24 ` Gustavo A. R. Silva
2017-01-12 2:45 Gustavo A. R. Silva
2017-01-16 23:42 ` Sebastian Reichel
2017-01-19 22:25 ` Gustavo A. R. Silva
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).