]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
pda_power: Remove ac_draw_failed goto and label
authorPaul Parsons <lost.distance@yahoo.com>
Fri, 21 Sep 2012 23:49:45 +0000 (16:49 -0700)
committerAnton Vorontsov <anton.vorontsov@linaro.org>
Fri, 21 Sep 2012 23:50:11 +0000 (16:50 -0700)
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@yahoo.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
drivers/power/pda_power.c

index 75536ebdb132ae2a978b61ede1b7436ecc1dde17..7df7c5facc10fee68e4d9a89b0f1e549ea16b3f7 100644 (file)
@@ -285,8 +285,6 @@ static int pda_power_probe(struct platform_device *pdev)
        if (IS_ERR(ac_draw)) {
                dev_dbg(dev, "couldn't get ac_draw regulator\n");
                ac_draw = NULL;
-               ret = PTR_ERR(ac_draw);
-               goto ac_draw_failed;
        }
 
        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: