Commit 2088716f authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: s3c2410: use core helper to mark adapter suspended 



Rejecting transfers should be handled by the core. Also, this will
ensure proper locking which was forgotten in this open coded version.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent d5c95bd6

drivers/i2c/busses/i2c-s3c2410.c

+2 −6
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ enum s3c24xx_i2c_state { 
struct s3c24xx_i2c {

	wait_queue_head_t	wait;

	kernel_ulong_t		quirks;

	unsigned int		suspended:1;



	struct i2c_msg		*msg;

	unsigned int		msg_num;
@@ -703,9 +702,6 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, 
	unsigned long timeout;

	int ret;



	if (i2c->suspended)

		return -EIO;



	ret = s3c24xx_i2c_set_master(i2c);

	if (ret != 0) {

		dev_err(i2c->dev, "cannot get bus (error %d)\n", ret);
@@ -1246,7 +1242,7 @@ static int s3c24xx_i2c_suspend_noirq(struct device *dev) 
{

	struct s3c24xx_i2c *i2c = dev_get_drvdata(dev);



	i2c->suspended = 1;

	i2c_mark_adapter_suspended(&i2c->adap);



	if (!IS_ERR(i2c->sysreg))

		regmap_read(i2c->sysreg, EXYNOS5_SYS_I2C_CFG, &i2c->sys_i2c_cfg);
@@ -1267,7 +1263,7 @@ static int s3c24xx_i2c_resume_noirq(struct device *dev) 
		return ret;

	s3c24xx_i2c_init(i2c);

	clk_disable(i2c->clk);

	i2c->suspended = 0;

	i2c_mark_adapter_resumed(&i2c->adap);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE