linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: linux-i2c@vger.kernel.org
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>,
	Chunyan Zhang <zhang.lyra@gmail.com>,
	linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-renesas-soc@vger.kernel.org,
	Hans de Goede <hdegoede@redhat.com>,
	Baolin Wang <baolin.wang@linaro.org>,
	Orson Zhai <orsonzhai@gmail.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [RFC/RFT 07/10] i2c: sprd: use core helper to mark adapter suspended
Date: Mon, 10 Dec 2018 22:03:05 +0100	[thread overview]
Message-ID: <20181210210310.12677-8-wsa+renesas@sang-engineering.com> (raw)
In-Reply-To: <20181210210310.12677-1-wsa+renesas@sang-engineering.com>

Rejecting transfers should be handled by the core.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/i2c/busses/i2c-sprd.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/drivers/i2c/busses/i2c-sprd.c b/drivers/i2c/busses/i2c-sprd.c
index e266d8a713d9..acbaf5fd29ee 100644
--- a/drivers/i2c/busses/i2c-sprd.c
+++ b/drivers/i2c/busses/i2c-sprd.c
@@ -86,7 +86,6 @@ struct sprd_i2c {
 	u32 count;
 	int irq;
 	int err;
-	bool is_suspended;
 };
 
 static void sprd_i2c_set_count(struct sprd_i2c *i2c_dev, u32 count)
@@ -284,9 +283,6 @@ static int sprd_i2c_master_xfer(struct i2c_adapter *i2c_adap,
 	struct sprd_i2c *i2c_dev = i2c_adap->algo_data;
 	int im, ret;
 
-	if (i2c_dev->is_suspended)
-		return -EBUSY;
-
 	ret = pm_runtime_get_sync(i2c_dev->dev);
 	if (ret < 0)
 		return ret;
@@ -590,10 +586,7 @@ static int __maybe_unused sprd_i2c_suspend_noirq(struct device *dev)
 {
 	struct sprd_i2c *i2c_dev = dev_get_drvdata(dev);
 
-	i2c_lock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);
-	i2c_dev->is_suspended = true;
-	i2c_unlock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);
-
+	i2c_mark_adapter_suspended(&i2c_dev->adap, true);
 	return pm_runtime_force_suspend(dev);
 }
 
@@ -601,10 +594,7 @@ static int __maybe_unused sprd_i2c_resume_noirq(struct device *dev)
 {
 	struct sprd_i2c *i2c_dev = dev_get_drvdata(dev);
 
-	i2c_lock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);
-	i2c_dev->is_suspended = false;
-	i2c_unlock_bus(&i2c_dev->adap, I2C_LOCK_ROOT_ADAPTER);
-
+	i2c_mark_adapter_suspended(&i2c_dev->adap, false);
 	return pm_runtime_force_resume(dev);
 }
 
-- 
2.11.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2018-12-10 21:05 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-10 21:02 [RFC/RFT 00/10] i2c: move handling of suspended adapters to the core Wolfram Sang
2018-12-10 21:02 ` [RFC/RFT 01/10] i2c: add 'is_suspended' flag for i2c adapters Wolfram Sang
2018-12-10 22:03   ` Peter Rosin
2018-12-18 23:33     ` Wolfram Sang
2018-12-19  9:39       ` Geert Uytterhoeven
2018-12-19 16:31         ` Wolfram Sang
2018-12-10 21:03 ` [RFC/RFT 02/10] i2c: reject new transfers when adapters are suspended Wolfram Sang
2018-12-10 21:03 ` [RFC/RFT 03/10] i2c: synquacer: remove unused is_suspended flag Wolfram Sang
2018-12-10 21:04   ` Ard Biesheuvel
2018-12-10 21:03 ` [RFC/RFT 04/10] i2c: brcmstb: use core helper to mark adapter suspended Wolfram Sang
2018-12-11 16:44   ` Kamal Dasu
2018-12-10 21:03 ` [RFC/RFT 05/10] i2c: zx2967: " Wolfram Sang
2018-12-11  2:12   ` Shawn Guo
2018-12-10 21:03 ` [RFC/RFT 06/10] i2c: sprd: don't use pdev as variable name for struct device * Wolfram Sang
2018-12-10 21:03 ` Wolfram Sang [this message]
2018-12-10 21:03 ` [RFC/RFT 08/10] i2c: exynos5: use core helper to mark adapter suspended Wolfram Sang
2018-12-18 11:23   ` Marek Szyprowski
2018-12-18 19:52     ` Wolfram Sang
2018-12-10 21:03 ` [RFC/RFT 09/10] i2c: s3c2410: " Wolfram Sang
2018-12-18 11:24   ` Marek Szyprowski
2018-12-10 21:03 ` [RFC/RFT 10/10] i2c: rcar: add suspend/resume support Wolfram Sang
2018-12-10 21:52   ` Peter Rosin
2018-12-18 23:47     ` Wolfram Sang
2018-12-11 19:24 ` [RFC/RFT 00/10] i2c: move handling of suspended adapters to the core Hans de Goede
2018-12-11 23:41   ` Wolfram Sang
2018-12-12 10:09     ` Hans de Goede
2018-12-18 20:17       ` Wolfram Sang
2018-12-18 21:44         ` Hans de Goede
2018-12-18 23:32           ` Wolfram Sang

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=20181210210310.12677-8-wsa+renesas@sang-engineering.com \
    --to=wsa+renesas@sang-engineering.com \
    --cc=baolin.wang@linaro.org \
    --cc=hdegoede@redhat.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=orsonzhai@gmail.com \
    --cc=zhang.lyra@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;
as well as URLs for NNTP newsgroup(s).