[PATCH V4 16/17] i2c: nomadik: Remove busy check for transfers at suspend late

[PATCH V4 16/17] i2c: nomadik: Remove busy check for transfers at suspend late

[Ulf Hansson]

We should never be busy performing transfers at suspend late, thus
there are no reason to check for it.

Cc: Alessandro Rubini <rubini@unipv.it>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

Changes in v4:
	Fixed compiler warning.

---
 drivers/i2c/busses/i2c-nomadik.c |   13 -------------
 1 file changed, 13 deletions(-)

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 66e8662..8082f5c 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -167,7 +167,6 @@ struct i2c_nmk_client {
  * @stop: stop condition.
  * @xfer_complete: acknowledge completion for a I2C message.
  * @result: controller propogated result.
- * @busy: Busy doing transfer.
  */
 struct nmk_i2c_dev {
 	struct i2c_vendor_data		*vendor;
@@ -185,7 +184,6 @@ struct nmk_i2c_dev {
 	int				stop;
 	struct completion		xfer_complete;
 	int				result;
-	bool				busy;
 };
 
 /* controller's abort causes */
@@ -671,8 +669,6 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
 	struct nmk_i2c_dev *dev = i2c_get_adapdata(i2c_adap);
 	int j;
 
-	dev->busy = true;
-
 	pm_runtime_get_sync(&dev->adev->dev);
 
 	/* Attempt three times to send the message queue */
@@ -697,8 +693,6 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
 
 	pm_runtime_put_sync(&dev->adev->dev);
 
-	dev->busy = false;
-
 	/* return the no. messages processed */
 	if (status)
 		return status;
@@ -885,12 +879,6 @@ static irqreturn_t i2c_irq_handler(int irq, void *arg)
 #ifdef CONFIG_PM_SLEEP
 static int nmk_i2c_suspend_late(struct device *dev)
 {
-	struct amba_device *adev = to_amba_device(dev);
-	struct nmk_i2c_dev *nmk_i2c = amba_get_drvdata(adev);
-
-	if (nmk_i2c->busy)
-		return -EBUSY;
-
 	pinctrl_pm_select_sleep_state(dev);
 
 	return 0;
@@ -992,7 +980,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
 		goto err_no_mem;
 	}
 	dev->vendor = vendor;
-	dev->busy = false;
 	dev->adev = adev;
 	nmk_i2c_of_probe(np, dev);
 
-- 
1.7.9.5

[PATCH V4 16/17] i2c: nomadik: Remove busy check for transfers at suspend late

[Wolfram Sang]

On Wed, Feb 19, 2014 at 01:27:47PM +0100, Ulf Hansson wrote:
> We should never be busy performing transfers at suspend late, thus
> there are no reason to check for it.
> 
> Cc: Alessandro Rubini <rubini@unipv.it>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

Okay applied up to patch 16 in a local branch. Waiting for LinusW to
comment on the 100kHz vs 400kHz issue before pushing out. If patch 17
can be applied now, please say so. If not, please resend when
dependencies are upstream.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140219/3da5c837/attachment.sig>

[PATCH V4 16/17] i2c: nomadik: Remove busy check for transfers at suspend late

[Ulf Hansson]

On 19 February 2014 17:05, Wolfram Sang <wsa@the-dreams.de> wrote:
> On Wed, Feb 19, 2014 at 01:27:47PM +0100, Ulf Hansson wrote:
>> We should never be busy performing transfers at suspend late, thus
>> there are no reason to check for it.
>>
>> Cc: Alessandro Rubini <rubini@unipv.it>
>> Cc: Linus Walleij <linus.walleij@linaro.org>
>> Cc: Wolfram Sang <wsa@the-dreams.de>
>> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
>
> Okay applied up to patch 16 in a local branch. Waiting for LinusW to
> comment on the 100kHz vs 400kHz issue before pushing out. If patch 17
> can be applied now, please say so. If not, please resend when
> dependencies are upstream.
>

Thanks Wolfram!

Again, sorry for screwing up several times. Let's wait with patch 17,
I will resend later.

Kind regards
Uffe