[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120921235144.GC26715@lizard>
Date: Fri, 21 Sep 2012 16:51:44 -0700
From: Anton Vorontsov <anton.vorontsov@...aro.org>
To: Paul Parsons <lost.distance@...oo.com>
Cc: dwmw2@...radead.org, philipp.zabel@...il.com,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] pda_power: remove ac_draw_failed goto and label
On Fri, Sep 21, 2012 at 01:56:43AM +0100, Paul Parsons wrote:
> A previous patch added the ac_draw_failed goto and label to
> pda_power_probe(). The goto would be invoked after a failed call to
> regulator_get().
>
> However the way ac_draw is used - always after a check for NULL -
> suggests that a failed call to regulator_get() was not fatal.
>
> This patch removes the ac_draw_failed goto and label, partly reverting
> the previous patch.
>
> This patch also removes the assignment of an error code to ret after a
> failed call to regulator_get(), since the error code is now never used.
>
> Signed-off-by: Paul Parsons <lost.distance@...oo.com>
> Cc: Philipp Zabel <philipp.zabel@...il.com>
> ---
> drivers/power/pda_power.c | 3 ---
> 1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
> index d3be834d..7df7c5f 100644
> --- a/drivers/power/pda_power.c
> +++ b/drivers/power/pda_power.c
> @@ -284,9 +284,7 @@ static int pda_power_probe(struct platform_device *pdev)
> ac_draw = regulator_get(dev, "ac_draw");
> if (IS_ERR(ac_draw)) {
> dev_dbg(dev, "couldn't get ac_draw regulator\n");
> - ret = PTR_ERR(ac_draw);
> ac_draw = NULL;
> - goto ac_draw_failed;
For some reason you have a bit different code, so your patch is not based
on the battery tree. (In my tree ret and ac_draw assignments are swapped.)
Maybe that's because I had to manually redo your first patch...
Anyway, I repeated your patch by hand again and thus applied it.
Thank you!
> }
>
> update_status();
> @@ -416,7 +414,6 @@ ac_supply_failed:
> regulator_put(ac_draw);
> ac_draw = NULL;
> }
> -ac_draw_failed:
> if (pdata->exit)
> pdata->exit(dev);
> init_failed:
> --
> 1.7.8.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists