Commit 80704a84 authored by Hans de Goede's avatar Hans de Goede Committed by Wolfram Sang
Browse files

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: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent c57813b8

drivers/i2c/busses/i2c-designware-core.h

+0 −2
Original line number Diff line number Diff line
@@ -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)

drivers/i2c/busses/i2c-designware-master.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

drivers/i2c/busses/i2c-designware-pcidrv.c

+2 −6
Original line number Diff line number Diff line
@@ -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;

}

drivers/i2c/busses/i2c-designware-platdrv.c

+2 −7
Original line number Diff line number Diff line
@@ -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;

}