i2c: designware: Use the i2c_mark_adapter_suspended/resumed() helpers

Use the i2c_mark_adapter_suspended/resumed() i2c-core helpers and rely
on the i2c-core's suspended checking instead of using DIY code.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index 1d65212fddbd34e9f0fb297b58c315a90dd787c9..70b80e7109905dc777bfa01f0dd3b70631e4e83f 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -236,7 +236,6 @@ struct reset_control;
  * @set_sda_hold_time: callback to retrieve IP specific SDA hold timing
  * @mode: operation mode - DW_IC_MASTER or DW_IC_SLAVE
  * @rinfo: I²C GPIO recovery information
- * @suspended: set to true if the controller is suspended
  *
  * HCNT and LCNT parameters can be used if the platform knows more accurate
  * values than the one computed based only on the input clock frequency.
@@ -295,7 +294,6 @@ struct dw_i2c_dev {
        int                     (*set_sda_hold_time)(struct dw_i2c_dev *dev);
        int                     mode;
        struct i2c_bus_recovery_info rinfo;
-       bool                    suspended;
 };
 
 #define ACCESS_INTR_MASK       BIT(0)

diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
index 1a4b23556db367687f11746a70ec21f24444b2b6..44a94b225ed8277e43d73094e8178e1158b43ce0 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-master.c
+++ b/drivers/i2c/busses/i2c-designware-master.c
@@ -567,11 +567,6 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
                goto done_nolock;
        }
 
-       if (dev_WARN_ONCE(dev->dev, dev->suspended, "Transfer while suspended\n")) {
-               ret = -ESHUTDOWN;
-               goto done_nolock;
-       }
-
        reinit_completion(&dev->cmd_complete);
        dev->msgs = msgs;
        dev->msgs_num = num;

diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c
index a736a2aaa66e34184d085dd9f04a9d036de3cacb..608e61209455643ceee23d88fbdde1c91d77d75f 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-pcidrv.c
+++ b/drivers/i2c/busses/i2c-designware-pcidrv.c
@@ -206,9 +206,7 @@ static int __maybe_unused i2c_dw_pci_suspend(struct device *dev)
 {
        struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
 
-       i2c_lock_bus(&i_dev->adapter, I2C_LOCK_ROOT_ADAPTER);
-       i_dev->suspended = true;
-       i2c_unlock_bus(&i_dev->adapter, I2C_LOCK_ROOT_ADAPTER);
+       i2c_mark_adapter_suspended(&i_dev->adapter);
 
        return i2c_dw_pci_runtime_suspend(dev);
 }
@@ -227,9 +225,7 @@ static int __maybe_unused i2c_dw_pci_resume(struct device *dev)
 
        ret = i2c_dw_pci_runtime_resume(dev);
 
-       i2c_lock_bus(&i_dev->adapter, I2C_LOCK_ROOT_ADAPTER);
-       i_dev->suspended = false;
-       i2c_unlock_bus(&i_dev->adapter, I2C_LOCK_ROOT_ADAPTER);
+       i2c_mark_adapter_resumed(&i_dev->adapter);
 
        return ret;
 }

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index f0703286d93b78026e6df9e2b4d0115a3555c702..116a297d1f6bbfe8abe047359b44fca586a6d17c 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -445,9 +445,7 @@ static int dw_i2c_plat_suspend(struct device *dev)
 {
        struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
 
-       i2c_lock_bus(&i_dev->adapter, I2C_LOCK_ROOT_ADAPTER);
-       i_dev->suspended = true;
-       i2c_unlock_bus(&i_dev->adapter, I2C_LOCK_ROOT_ADAPTER);
+       i2c_mark_adapter_suspended(&i_dev->adapter);
 
        return dw_i2c_plat_runtime_suspend(dev);
 }
@@ -469,10 +467,7 @@ static int dw_i2c_plat_resume(struct device *dev)
        struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
 
        dw_i2c_plat_runtime_resume(dev);
-
-       i2c_lock_bus(&i_dev->adapter, I2C_LOCK_ROOT_ADAPTER);
-       i_dev->suspended = false;
-       i2c_unlock_bus(&i_dev->adapter, I2C_LOCK_ROOT_ADAPTER);
+       i2c_mark_adapter_resumed(&i_dev->adapter);
 
        return 0;
 }