* [PATCH 1/1] power/ab8500_charger: Use devm_regulator_get API
@ 2012-12-07 11:53 Sachin Kamat
2012-12-10 9:22 ` Linus Walleij
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Sachin Kamat @ 2012-12-07 11:53 UTC (permalink / raw)
To: linux-kernel
Cc: dwmw2, cbou, anton.vorontsov, sachin.kamat, patches,
Arun R Murthy
devm_regulator_get() is device managed and makes error handling
and code cleanup simpler.
Cc: Arun R Murthy <arun.murthy@stericsson.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
Compile tested using linux-next.
---
drivers/power/ab8500_charger.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index 3be9c0e..5062023 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -2509,9 +2509,6 @@ static int ab8500_charger_remove(struct platform_device *pdev)
free_irq(irq, di);
}
- /* disable the regulator */
- regulator_put(di->regu);
-
/* Backup battery voltage and current disable */
ret = abx500_mask_and_set_register_interruptible(di->dev,
AB8500_RTC, AB8500_RTC_CTRL_REG, RTC_BUP_CH_ENA, 0);
@@ -2665,7 +2662,7 @@ static int ab8500_charger_probe(struct platform_device *pdev)
* is a charger connected to avoid erroneous BTEMP_HIGH/LOW
* interrupts during charging
*/
- di->regu = regulator_get(di->dev, "vddadc");
+ di->regu = devm_regulator_get(di->dev, "vddadc");
if (IS_ERR(di->regu)) {
ret = PTR_ERR(di->regu);
dev_err(di->dev, "failed to get vddadc regulator\n");
@@ -2677,14 +2674,14 @@ static int ab8500_charger_probe(struct platform_device *pdev)
ret = ab8500_charger_init_hw_registers(di);
if (ret) {
dev_err(di->dev, "failed to initialize ABB registers\n");
- goto free_regulator;
+ goto free_charger_wq;
}
/* Register AC charger class */
ret = power_supply_register(di->dev, &di->ac_chg.psy);
if (ret) {
dev_err(di->dev, "failed to register AC charger\n");
- goto free_regulator;
+ goto free_charger_wq;
}
/* Register USB charger class */
@@ -2758,8 +2755,6 @@ free_usb:
power_supply_unregister(&di->usb_chg.psy);
free_ac:
power_supply_unregister(&di->ac_chg.psy);
-free_regulator:
- regulator_put(di->regu);
free_charger_wq:
destroy_workqueue(di->charger_wq);
return ret;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] power/ab8500_charger: Use devm_regulator_get API
2012-12-07 11:53 [PATCH 1/1] power/ab8500_charger: Use devm_regulator_get API Sachin Kamat
@ 2012-12-10 9:22 ` Linus Walleij
2012-12-10 9:24 ` Arun MURTHY
2013-01-06 3:07 ` Anton Vorontsov
2 siblings, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2012-12-10 9:22 UTC (permalink / raw)
To: Sachin Kamat
Cc: linux-kernel, dwmw2, cbou, anton.vorontsov, patches,
Arun R Murthy
On Fri, Dec 7, 2012 at 12:53 PM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> devm_regulator_get() is device managed and makes error handling
> and code cleanup simpler.
>
> Cc: Arun R Murthy <arun.murthy@stericsson.com>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Looks good to me!
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH 1/1] power/ab8500_charger: Use devm_regulator_get API
2012-12-07 11:53 [PATCH 1/1] power/ab8500_charger: Use devm_regulator_get API Sachin Kamat
2012-12-10 9:22 ` Linus Walleij
@ 2012-12-10 9:24 ` Arun MURTHY
2013-01-06 3:07 ` Anton Vorontsov
2 siblings, 0 replies; 4+ messages in thread
From: Arun MURTHY @ 2012-12-10 9:24 UTC (permalink / raw)
To: Sachin Kamat, linux-kernel@vger.kernel.org
Cc: dwmw2@infradead.org, cbou@mail.ru, anton.vorontsov@linaro.org,
patches@linaro.org
> devm_regulator_get() is device managed and makes error handling and code
> cleanup simpler.
>
> Cc: Arun R Murthy <arun.murthy@stericsson.com>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
> Compile tested using linux-next.
> ---
> drivers/power/ab8500_charger.c | 11 +++--------
> 1 files changed, 3 insertions(+), 8 deletions(-)
>
Acked-by: Arun Murthy <arun.murthy@stericsson.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/1] power/ab8500_charger: Use devm_regulator_get API
2012-12-07 11:53 [PATCH 1/1] power/ab8500_charger: Use devm_regulator_get API Sachin Kamat
2012-12-10 9:22 ` Linus Walleij
2012-12-10 9:24 ` Arun MURTHY
@ 2013-01-06 3:07 ` Anton Vorontsov
2 siblings, 0 replies; 4+ messages in thread
From: Anton Vorontsov @ 2013-01-06 3:07 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-kernel, dwmw2, patches, Arun R Murthy
On Fri, Dec 07, 2012 at 05:23:28PM +0530, Sachin Kamat wrote:
> devm_regulator_get() is device managed and makes error handling
> and code cleanup simpler.
>
> Cc: Arun R Murthy <arun.murthy@stericsson.com>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
> Compile tested using linux-next.
> ---
Applied, thanks!
> drivers/power/ab8500_charger.c | 11 +++--------
> 1 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
> index 3be9c0e..5062023 100644
> --- a/drivers/power/ab8500_charger.c
> +++ b/drivers/power/ab8500_charger.c
> @@ -2509,9 +2509,6 @@ static int ab8500_charger_remove(struct platform_device *pdev)
> free_irq(irq, di);
> }
>
> - /* disable the regulator */
> - regulator_put(di->regu);
> -
> /* Backup battery voltage and current disable */
> ret = abx500_mask_and_set_register_interruptible(di->dev,
> AB8500_RTC, AB8500_RTC_CTRL_REG, RTC_BUP_CH_ENA, 0);
> @@ -2665,7 +2662,7 @@ static int ab8500_charger_probe(struct platform_device *pdev)
> * is a charger connected to avoid erroneous BTEMP_HIGH/LOW
> * interrupts during charging
> */
> - di->regu = regulator_get(di->dev, "vddadc");
> + di->regu = devm_regulator_get(di->dev, "vddadc");
> if (IS_ERR(di->regu)) {
> ret = PTR_ERR(di->regu);
> dev_err(di->dev, "failed to get vddadc regulator\n");
> @@ -2677,14 +2674,14 @@ static int ab8500_charger_probe(struct platform_device *pdev)
> ret = ab8500_charger_init_hw_registers(di);
> if (ret) {
> dev_err(di->dev, "failed to initialize ABB registers\n");
> - goto free_regulator;
> + goto free_charger_wq;
> }
>
> /* Register AC charger class */
> ret = power_supply_register(di->dev, &di->ac_chg.psy);
> if (ret) {
> dev_err(di->dev, "failed to register AC charger\n");
> - goto free_regulator;
> + goto free_charger_wq;
> }
>
> /* Register USB charger class */
> @@ -2758,8 +2755,6 @@ free_usb:
> power_supply_unregister(&di->usb_chg.psy);
> free_ac:
> power_supply_unregister(&di->ac_chg.psy);
> -free_regulator:
> - regulator_put(di->regu);
> free_charger_wq:
> destroy_workqueue(di->charger_wq);
> return ret;
> --
> 1.7.4.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-01-06 3:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-07 11:53 [PATCH 1/1] power/ab8500_charger: Use devm_regulator_get API Sachin Kamat
2012-12-10 9:22 ` Linus Walleij
2012-12-10 9:24 ` Arun MURTHY
2013-01-06 3:07 ` Anton Vorontsov
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).