Re: [PATCH 07/10] i2c: sprd: use core helper to mark adapter suspended

2018-12-21 Thread Baolin Wang
Hi Wolfram,

On Thu, 20 Dec 2018 at 00:48, Wolfram Sang
 wrote:
>
> Rejecting transfers should be handled by the core.
>
> Signed-off-by: Wolfram Sang 

Great to see the I2C core can handle this issue.
Reviewed-by: Baolin Wang 

> ---
>  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..961123529678 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(_dev->adap, I2C_LOCK_ROOT_ADAPTER);
> -   i2c_dev->is_suspended = true;
> -   i2c_unlock_bus(_dev->adap, I2C_LOCK_ROOT_ADAPTER);
> -
> +   i2c_mark_adapter_suspended(_dev->adap);
> 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(_dev->adap, I2C_LOCK_ROOT_ADAPTER);
> -   i2c_dev->is_suspended = false;
> -   i2c_unlock_bus(_dev->adap, I2C_LOCK_ROOT_ADAPTER);
> -
> +   i2c_mark_adapter_resumed(_dev->adap);
> return pm_runtime_force_resume(dev);
>  }
>
> --
> 2.11.0
>


-- 
Baolin Wang
Best Regards


[PATCH 07/10] i2c: sprd: use core helper to mark adapter suspended

2018-12-19 Thread Wolfram Sang
Rejecting transfers should be handled by the core.

Signed-off-by: Wolfram Sang 
---
 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..961123529678 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(_dev->adap, I2C_LOCK_ROOT_ADAPTER);
-   i2c_dev->is_suspended = true;
-   i2c_unlock_bus(_dev->adap, I2C_LOCK_ROOT_ADAPTER);
-
+   i2c_mark_adapter_suspended(_dev->adap);
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(_dev->adap, I2C_LOCK_ROOT_ADAPTER);
-   i2c_dev->is_suspended = false;
-   i2c_unlock_bus(_dev->adap, I2C_LOCK_ROOT_ADAPTER);
-
+   i2c_mark_adapter_resumed(_dev->adap);
return pm_runtime_force_resume(dev);
 }
 
-- 
2.11.0