mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: anton.vorontsov@linaro.org, alan@linux.intel.com,
	bruce.e.robertson@intel.com,
	Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: [PATCH 3/4] power-supply: smb347-charger: move IRQ enabling to the end of probe
Date: Mon, 16 Apr 2012 11:48:40 +0300	[thread overview]
Message-ID: <1334566121-8243-3-git-send-email-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <1334566121-8243-1-git-send-email-mika.westerberg@linux.intel.com>

There is a potential problem if we call smb347_irq_enable() from
smb347_irq_init() because smb347_irq_enable() makes the device registers
read-only once it returns and smb347_irq_init() expects them to still be
read-write. Currently no harm happens because it is the last call we make in
smb347_irq_init().

Anyway a better place for enabling IRQs is at the end of probe function and
this is also symmetric to call smb347_irq_disable() which is done at the
beginning of remove function.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
 drivers/power/smb347-charger.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/power/smb347-charger.c b/drivers/power/smb347-charger.c
index d774fd3..781c058 100644
--- a/drivers/power/smb347-charger.c
+++ b/drivers/power/smb347-charger.c
@@ -923,10 +923,6 @@ static int smb347_irq_init(struct smb347_charger *smb)
 	if (ret < 0)
 		goto fail_readonly;
 
-	ret = smb347_irq_enable(smb);
-	if (ret < 0)
-		goto fail_readonly;
-
 	smb347_set_writable(smb, false);
 	smb->client->irq = irq;
 	return 0;
@@ -1233,6 +1229,8 @@ static int smb347_probe(struct i2c_client *client,
 		if (ret < 0) {
 			dev_warn(dev, "failed to initialize IRQ: %d\n", ret);
 			dev_warn(dev, "disabling IRQ support\n");
+		} else {
+			smb347_irq_enable(smb);
 		}
 	}
 
-- 
1.7.9.1


  parent reply	other threads:[~2012-04-16  8:48 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-16  8:48 [PATCH 1/4] power-supply: smb347-charger: convert to use module_i2c_driver() Mika Westerberg
2012-04-16  8:48 ` [PATCH 2/4] power-supply: smb347-charger: rename few functions to match better what they are doing Mika Westerberg
2012-04-16  8:48 ` Mika Westerberg [this message]
2012-04-16  8:48 ` [PATCH 4/4] power-supply: smb347-charger: convert to regmap API Mika Westerberg
2012-05-05 12:52   ` Anton Vorontsov
2012-05-06  6:34     ` Mika Westerberg
2012-05-05 12:56 ` [PATCH 1/4] power-supply: smb347-charger: convert to use module_i2c_driver() Anton Vorontsov

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=1334566121-8243-3-git-send-email-mika.westerberg@linux.intel.com \
    --to=mika.westerberg@linux.intel.com \
    --cc=alan@linux.intel.com \
    --cc=anton.vorontsov@linaro.org \
    --cc=bruce.e.robertson@intel.com \
    --cc=linux-kernel@vger.kernel.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

Powered by JetHome