public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Paul Parsons <lost.distance@yahoo.com>
To: cbou@mail.ru, dwmw2@infradead.org
Cc: philipp.zabel@gmail.com, linux-kernel@vger.kernel.org
Subject: [PATCH] pda_power: remove ac_draw_failed goto and label
Date: Fri, 21 Sep 2012 01:56:43 +0100	[thread overview]
Message-ID: <505BBB4B.3060508@yahoo.com> (raw)

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>
---
  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;
  	}

  	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


             reply	other threads:[~2012-09-21  1:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-21  0:56 Paul Parsons [this message]
2012-09-21 23:51 ` [PATCH] pda_power: remove ac_draw_failed goto and label Anton Vorontsov
2012-09-22  0:59   ` Paul Parsons

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=505BBB4B.3060508@yahoo.com \
    --to=lost.distance@yahoo.com \
    --cc=cbou@mail.ru \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=philipp.zabel@gmail.com \
    /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