From: Marek Vasut <marex@denx.de>
To: Sachin Kamat <sachin.kamat@linaro.org>
Cc: linux-kernel@vger.kernel.org, broonie@kernel.org, nm@ti.com,
ldewangan@nvidia.com, gg@slimlogic.co.uk, yong.shen@linaro.org,
s.hauer@pengutronix.de, Nancy.Chen@freescale.com
Subject: Re: [PATCH 5/7] regulator: palmas: Use devm_regulator_register
Date: Wed, 4 Sep 2013 16:32:12 +0200 [thread overview]
Message-ID: <201309041632.13150.marex@denx.de> (raw)
In-Reply-To: <1378276263-10735-5-git-send-email-sachin.kamat@linaro.org>
Dear Sachin Kamat,
> devm_* simplifies the code.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
> drivers/regulator/palmas-regulator.c | 38
> ++++++++++------------------------ 1 file changed, 11 insertions(+), 27
> deletions(-)
>
> diff --git a/drivers/regulator/palmas-regulator.c
> b/drivers/regulator/palmas-regulator.c index d0c8785..37b1068 100644
> --- a/drivers/regulator/palmas-regulator.c
> +++ b/drivers/regulator/palmas-regulator.c
> @@ -852,7 +852,7 @@ static int palmas_regulators_probe(struct
> platform_device *pdev) if (ret < 0) {
> dev_err(&pdev->dev,
> "reading TSTEP reg failed: %d\n", ret);
> - goto err_unregister_regulator;
> + return ret;
> }
> pmic->desc[id].ramp_delay =
> palmas_smps_ramp_delay[reg & 0x3];
> @@ -864,7 +864,7 @@ static int palmas_regulators_probe(struct
> platform_device *pdev) reg_init = pdata->reg_init[id];
> ret = palmas_smps_init(palmas, id, reg_init);
> if (ret)
> - goto err_unregister_regulator;
> + return ret;
> }
>
> /* Register the regulators */
> @@ -897,7 +897,7 @@ static int palmas_regulators_probe(struct
> platform_device *pdev)
>
> ret = palmas_smps_read(pmic->palmas, addr, ®);
> if (ret)
> - goto err_unregister_regulator;
> + return ret;
> if (reg & PALMAS_SMPS12_VOLTAGE_RANGE)
> pmic->range[id] = 1;
>
> @@ -913,7 +913,7 @@ static int palmas_regulators_probe(struct
> platform_device *pdev) addr = palmas_regs_info[id].ctrl_addr;
> ret = palmas_smps_read(pmic->palmas, addr, ®);
> if (ret)
> - goto err_unregister_regulator;
> + return ret;
> pmic->current_reg_mode[id] = reg &
> PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK;
> }
> @@ -929,13 +929,13 @@ static int palmas_regulators_probe(struct
> platform_device *pdev) pmic->desc[id].supply_name =
> palmas_regs_info[id].sname;
> config.of_node = palmas_matches[id].of_node;
>
> - rdev = regulator_register(&pmic->desc[id], &config);
> + rdev = devm_regulator_register(&pdev->dev, &pmic->desc[id],
> + &config);
> if (IS_ERR(rdev)) {
> dev_err(&pdev->dev,
> "failed to register %s regulator\n",
> pdev->name);
> - ret = PTR_ERR(rdev);
> - goto err_unregister_regulator;
> + return PTR_ERR(rdev);
> }
>
> /* Save regulator for cleanup */
> @@ -997,13 +997,13 @@ static int palmas_regulators_probe(struct
> platform_device *pdev) pmic->desc[id].supply_name =
> palmas_regs_info[id].sname;
> config.of_node = palmas_matches[id].of_node;
>
> - rdev = regulator_register(&pmic->desc[id], &config);
> + rdev = devm_regulator_register(&pdev->dev, &pmic->desc[id],
> + &config);
> if (IS_ERR(rdev)) {
> dev_err(&pdev->dev,
> "failed to register %s regulator\n",
> pdev->name);
> - ret = PTR_ERR(rdev);
> - goto err_unregister_regulator;
> + return PTR_ERR(rdev);
> }
>
> /* Save regulator for cleanup */
> @@ -1021,7 +1021,7 @@ static int palmas_regulators_probe(struct
> platform_device *pdev) id, reg_init);
> if (ret) {
> regulator_unregister(pmic->rdev[id]);
> - goto err_unregister_regulator;
> + return ret;
> }
what about this regulator_unregister() above here?
[...]
Best regards,
Marek Vasut
next prev parent reply other threads:[~2013-09-04 14:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-04 6:30 [PATCH 1/7] regulator: anatop-regulator: Use devm_regulator_register Sachin Kamat
2013-09-04 6:30 ` [PATCH 2/7] regulator: isl6271a-regulator: " Sachin Kamat
2013-09-04 14:26 ` Marek Vasut
2013-09-04 6:30 ` [PATCH 3/7] regulator: mc13783: " Sachin Kamat
2013-09-04 14:27 ` Marek Vasut
2013-09-04 6:31 ` [PATCH 4/7] regulator: mc13892: " Sachin Kamat
2013-09-04 14:29 ` Marek Vasut
2013-09-04 6:31 ` [PATCH 5/7] regulator: palmas: " Sachin Kamat
2013-09-04 14:32 ` Marek Vasut [this message]
2013-09-04 15:14 ` Sachin Kamat
2013-09-04 6:31 ` [PATCH 6/7] regulator: rc5t583: " Sachin Kamat
2013-09-04 14:33 ` Marek Vasut
2013-09-04 6:31 ` [PATCH 7/7] regulator: ti-abb: " Sachin Kamat
2013-09-04 13:27 ` Nishanth Menon
2013-09-04 15:12 ` Mark Brown
2013-09-04 15:15 ` Nishanth Menon
2013-09-04 16:26 ` Sachin Kamat
2013-09-04 16:33 ` Nishanth Menon
2013-09-04 16:48 ` Sachin Kamat
2013-09-04 17:00 ` Nishanth Menon
2013-09-04 18:03 ` Mark Brown
2013-09-04 9:49 ` [PATCH 1/7] regulator: anatop-regulator: " Mark Brown
2013-09-04 14:25 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201309041632.13150.marex@denx.de \
--to=marex@denx.de \
--cc=Nancy.Chen@freescale.com \
--cc=broonie@kernel.org \
--cc=gg@slimlogic.co.uk \
--cc=ldewangan@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nm@ti.com \
--cc=s.hauer@pengutronix.de \
--cc=sachin.kamat@linaro.org \
--cc=yong.shen@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox