| Message ID | 20181210210310.12677-10-wsa+renesas@sang-engineering.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | i2c: move handling of suspended adapters to the core | expand |
Hi, On 2018-12-10 22:03, Wolfram Sang wrote: > 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: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Works fine on Odroid U3. > --- > drivers/i2c/busses/i2c-s3c2410.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c > index 2f2e28d60ef5..7c76edb25514 100644 > --- a/drivers/i2c/busses/i2c-s3c2410.c > +++ b/drivers/i2c/busses/i2c-s3c2410.c > @@ -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, true); > > 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_suspended(&i2c->adap, false); > > return 0; > } Best regards
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 2f2e28d60ef5..7c76edb25514 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -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, true); 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_suspended(&i2c->adap, false); return 0; }
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: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/i2c/busses/i2c-s3c2410.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)