All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Campello <campello@chromium.org>
To: LKML <devicetree@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>
Cc: Jonathan Cameron <jic23@kernel.org>,
	Daniel Campello <campello@chromium.org>,
	Andy Shevchenko <andy.shevchenko@gmail.com>,
	Douglas Anderson <dianders@chromium.org>,
	Gwendal Grignou <gwendal@chromium.org>,
	Hartmut Knaack <knaack.h@gmx.de>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
	Stephen Boyd <swboyd@chromium.org>,
	linux-iio@vger.kernel.org
Subject: [PATCH v2 03/14] iio: sx9310: Fix irq handling
Date: Tue, 28 Jul 2020 17:05:09 -0600	[thread overview]
Message-ID: <20200728170317.v2.3.Idbfcd2e92d2fd89b6ed2e83211bd3e6c06852c33@changeid> (raw)
In-Reply-To: <20200728230520.2011240-1-campello@chromium.org>

Fixes enable/disable irq handling at various points. The driver needs to
only enable/disable irqs if there is an actual irq handler installed.

Signed-off-by: Daniel Campello <campello@chromium.org>
---

Changes in v2:
 - Reordered error handling on sx9310_resume()

 drivers/iio/proximity/sx9310.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c
index 07895d4b935d12..108d82ba81146e 100644
--- a/drivers/iio/proximity/sx9310.c
+++ b/drivers/iio/proximity/sx9310.c
@@ -376,13 +376,15 @@ static int sx9310_read_proximity(struct sx9310_data *data,
 	if (ret < 0)
 		goto out;
 
-	ret = sx9310_enable_irq(data, SX9310_CONVDONE_IRQ);
-	if (ret < 0)
-		goto out_put_channel;
+	if (data->client->irq) {
+		ret = sx9310_enable_irq(data, SX9310_CONVDONE_IRQ);
+		if (ret)
+			goto out_put_channel;
+	}
 
 	mutex_unlock(&data->mutex);
 
-	if (data->client->irq > 0) {
+	if (data->client->irq) {
 		ret = wait_for_completion_interruptible(&data->completion);
 		reinit_completion(&data->completion);
 	} else {
@@ -401,9 +403,11 @@ static int sx9310_read_proximity(struct sx9310_data *data,
 	*val = sign_extend32(be16_to_cpu(rawval),
 			     (chan->address == SX9310_REG_DIFF_MSB ? 11 : 15));
 
-	ret = sx9310_disable_irq(data, SX9310_CONVDONE_IRQ);
-	if (ret < 0)
-		goto out_put_channel;
+	if (data->client->irq) {
+		ret = sx9310_disable_irq(data, SX9310_CONVDONE_IRQ);
+		if (ret)
+			goto out_put_channel;
+	}
 
 	ret = sx9310_put_read_channel(data, chan->channel);
 	if (ret < 0)
@@ -414,7 +418,8 @@ static int sx9310_read_proximity(struct sx9310_data *data,
 	return IIO_VAL_INT;
 
 out_disable_irq:
-	sx9310_disable_irq(data, SX9310_CONVDONE_IRQ);
+	if (data->client->irq)
+		sx9310_disable_irq(data, SX9310_CONVDONE_IRQ);
 out_put_channel:
 	sx9310_put_read_channel(data, chan->channel);
 out:
@@ -1011,10 +1016,11 @@ static int __maybe_unused sx9310_resume(struct device *dev)
 
 out:
 	mutex_unlock(&data->mutex);
+	if (ret)
+		return ret;
 
 	enable_irq(data->client->irq);
-
-	return ret;
+	return 0;
 }
 
 static const struct dev_pm_ops sx9310_pm_ops = {
-- 
2.28.0.163.g6104cc2f0b6-goog


  parent reply	other threads:[~2020-07-28 23:06 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-25  0:40 [PATCH] iio: sx9310: Fixes dropped on initial commit Daniel Campello
2020-07-26  8:10 ` Andy Shevchenko
2020-07-26 11:53 ` Jonathan Cameron
2020-07-28 15:12 ` [PATCH 00/15] sx9310 iio driver updates Daniel Campello
2020-07-28 15:12   ` [PATCH 01/15] dt-bindings: iio: Add bindings for sx9310 sensor Daniel Campello
2020-07-28 22:06     ` Stephen Boyd
2020-07-28 15:12   ` [PATCH 02/15] iio: sx9310: Update macros declarations Daniel Campello
2020-07-28 19:42     ` Stephen Boyd
2020-07-28 15:12   ` [PATCH 03/15] iio: sx9310: Fix irq handling Daniel Campello
2020-07-28 18:08     ` Andy Shevchenko
2020-07-28 20:07       ` Daniel Campello
2020-07-28 20:15         ` Stephen Boyd
2020-07-28 15:12   ` [PATCH 04/15] iio: sx9310: Remove acpi and of table macros Daniel Campello
2020-07-28 18:09     ` Andy Shevchenko
2020-07-28 20:47       ` Daniel Campello
2020-07-28 21:28         ` Stephen Boyd
2020-07-28 15:12   ` [PATCH 05/15] iio: sx9310: Change from .probe to .probe_new Daniel Campello
2020-07-28 18:10     ` Andy Shevchenko
2020-07-28 19:32     ` Stephen Boyd
2020-07-28 15:12   ` [PATCH 06/15] iio: sx9310: Align memory Daniel Campello
2020-07-28 18:11     ` Andy Shevchenko
2020-07-28 21:26       ` Daniel Campello
2020-07-29  6:52         ` Andy Shevchenko
2020-07-28 15:12   ` [PATCH 07/15] iio: sx9310: Use long instead of int for channel bitmaps Daniel Campello
2020-07-28 18:13     ` Andy Shevchenko
2020-07-28 19:37     ` Stephen Boyd
2020-07-28 15:12   ` [PATCH 08/15] iio: sx9310: Use regmap_read_poll_timeout() for compensation Daniel Campello
2020-07-28 18:14     ` Andy Shevchenko
2020-07-28 19:37     ` Stephen Boyd
2020-07-28 15:12   ` [PATCH 09/15] iio: sx9310: Update copyright Daniel Campello
2020-07-28 15:12   ` [PATCH 10/15] iio: sx9310: Simplify error return handling Daniel Campello
2020-07-28 18:15     ` Andy Shevchenko
2020-07-28 19:40     ` Stephen Boyd
2020-07-28 21:23       ` Daniel Campello
2020-07-28 21:32         ` Stephen Boyd
2020-07-28 22:06           ` Daniel Campello
2020-07-28 15:12   ` [PATCH 11/15] iio: sx9310: Use variable to hold &client->dev Daniel Campello
2020-07-28 18:16     ` Andy Shevchenko
2020-07-28 19:41     ` Stephen Boyd
2020-07-28 15:12   ` [PATCH 12/15] iio: sx9310: Miscellaneous format fixes Daniel Campello
2020-07-28 18:16     ` Andy Shevchenko
2020-07-28 19:41     ` Stephen Boyd
2020-07-28 15:12   ` [PATCH 13/15] iio: sx9310: Add newlines to printks Daniel Campello
2020-07-28 18:19     ` Andy Shevchenko
2020-07-28 18:24       ` Joe Perches
2020-07-28 18:32         ` Andy Shevchenko
2020-07-28 15:12   ` [PATCH 14/15] iio: sx9310: Drop channel_users[] Daniel Campello
2020-07-28 18:20     ` Andy Shevchenko
2020-07-28 15:12   ` [PATCH 15/15] iio: sx9310: Enable vdd and svdd regulators at probe Daniel Campello
2020-07-28 18:21     ` Andy Shevchenko
2020-07-28 23:05   ` [PATCH v2 00/14] sx9310 iio driver updates Daniel Campello
2020-07-28 23:05     ` [PATCH v2 01/14] dt-bindings: iio: Add bindings for sx9310 sensor Daniel Campello
2020-07-29  0:52       ` Stephen Boyd
2020-07-28 23:05     ` [PATCH v2 02/14] iio: sx9310: Update macros declarations Daniel Campello
2020-07-28 23:05     ` Daniel Campello [this message]
2020-07-29  8:40       ` [PATCH v2 03/14] iio: sx9310: Fix irq handling Stephen Boyd
2020-07-28 23:05     ` [PATCH v2 04/14] iio: sx9310: Remove acpi and of table macros Daniel Campello
2020-07-29  6:54       ` Andy Shevchenko
2020-07-29  8:38       ` Stephen Boyd
2020-07-28 23:05     ` [PATCH v2 05/14] iio: sx9310: Change from .probe to .probe_new Daniel Campello
2020-07-28 23:05     ` [PATCH v2 06/14] iio: sx9310: Fixes various memory handling Daniel Campello
2020-07-28 23:05     ` [PATCH v2 07/14] iio: sx9310: Use long instead of int for channel bitmaps Daniel Campello
2020-07-29  1:03       ` Stephen Boyd
2020-07-29  7:00         ` Andy Shevchenko
2020-07-31 15:44           ` Daniel Campello
2020-07-31 15:52             ` Andy Shevchenko
2020-07-28 23:05     ` [PATCH v2 08/14] iio: sx9310: Use regmap_read_poll_timeout() for compensation Daniel Campello
2020-07-28 23:05     ` [PATCH v2 09/14] iio: sx9310: Update copyright Daniel Campello
2020-07-28 23:05     ` [PATCH v2 10/14] iio: sx9310: Simplify error return handling Daniel Campello
2020-07-29  8:42       ` Stephen Boyd
2020-07-28 23:05     ` [PATCH v2 11/14] iio: sx9310: Use variable to hold &client->dev Daniel Campello
2020-07-28 23:05     ` [PATCH v2 12/14] iio: sx9310: Miscellaneous format fixes Daniel Campello
2020-07-28 23:05     ` [PATCH v2 13/14] iio: sx9310: Drop channel_users[] Daniel Campello
2020-07-28 23:05     ` [PATCH v2 14/14] iio: sx9310: Enable vdd and svdd regulators at probe Daniel Campello
2020-07-29  0:50     ` [PATCH v2 00/14] sx9310 iio driver updates Stephen Boyd
2020-07-29  9:20     ` Stephen Boyd

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=20200728170317.v2.3.Idbfcd2e92d2fd89b6ed2e83211bd3e6c06852c33@changeid \
    --to=campello@chromium.org \
    --cc=andy.shevchenko@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dianders@chromium.org \
    --cc=gwendal@chromium.org \
    --cc=jic23@kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    --cc=swboyd@chromium.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.