Commit f2e0d28c authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: brcmstb: use core helper to mark adapter suspended 



Rejecting transfers should be handled by the core.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarKamal Dasu <kdasu.kdev@gmail.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 1adcc83e

drivers/i2c/busses/i2c-brcmstb.c

+2 −11
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ struct brcmstb_i2c_dev { 
	struct bsc_regs *bsc_regmap;

	struct i2c_adapter adapter;

	struct completion done;

	bool is_suspended;

	u32 clk_freq_hz;

	int data_regsz;

};
@@ -467,9 +466,6 @@ static int brcmstb_i2c_xfer(struct i2c_adapter *adapter, 
	int xfersz = brcmstb_i2c_get_xfersz(dev);

	u32 cond, cond_per_msg;



	if (dev->is_suspended)

		return -EBUSY;



	/* Loop through all messages */

	for (i = 0; i < num; i++) {

		pmsg = &msgs[i];
@@ -689,10 +685,7 @@ static int brcmstb_i2c_suspend(struct device *dev) 
{

	struct brcmstb_i2c_dev *i2c_dev = dev_get_drvdata(dev);



	i2c_lock_bus(&i2c_dev->adapter, I2C_LOCK_ROOT_ADAPTER);

	i2c_dev->is_suspended = true;

	i2c_unlock_bus(&i2c_dev->adapter, I2C_LOCK_ROOT_ADAPTER);



	i2c_mark_adapter_suspended(&i2c_dev->adapter);

	return 0;

}
@@ -700,10 +693,8 @@ static int brcmstb_i2c_resume(struct device *dev) 
{

	struct brcmstb_i2c_dev *i2c_dev = dev_get_drvdata(dev);



	i2c_lock_bus(&i2c_dev->adapter, I2C_LOCK_ROOT_ADAPTER);

	brcmstb_i2c_set_bsc_reg_defaults(i2c_dev);

	i2c_dev->is_suspended = false;

	i2c_unlock_bus(&i2c_dev->adapter, I2C_LOCK_ROOT_ADAPTER);

	i2c_mark_adapter_resumed(&i2c_dev->adapter);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE