Skip to content

Commit d5c95bd

Browse files
Wolfram SangWolfram Sang
authored andcommitted
i2c: exynos5: 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: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
1 parent 5a7b81f commit d5c95bd

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

drivers/i2c/busses/i2c-exynos5.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ enum i2c_type_exynos {
183183

184184
struct exynos5_i2c {
185185
struct i2c_adapter adap;
186-
unsigned int suspended:1;
187186

188187
struct i2c_msg *msg;
189188
struct completion msg_complete;
@@ -715,11 +714,6 @@ static int exynos5_i2c_xfer(struct i2c_adapter *adap,
715714
struct exynos5_i2c *i2c = adap->algo_data;
716715
int i, ret;
717716

718-
if (i2c->suspended) {
719-
dev_err(i2c->dev, "HS-I2C is not initialized.\n");
720-
return -EIO;
721-
}
722-
723717
ret = clk_enable(i2c->clk);
724718
if (ret)
725719
return ret;
@@ -847,8 +841,7 @@ static int exynos5_i2c_suspend_noirq(struct device *dev)
847841
{
848842
struct exynos5_i2c *i2c = dev_get_drvdata(dev);
849843

850-
i2c->suspended = 1;
851-
844+
i2c_mark_adapter_suspended(&i2c->adap);
852845
clk_unprepare(i2c->clk);
853846

854847
return 0;
@@ -871,7 +864,7 @@ static int exynos5_i2c_resume_noirq(struct device *dev)
871864

872865
exynos5_i2c_init(i2c);
873866
clk_disable(i2c->clk);
874-
i2c->suspended = 0;
867+
i2c_mark_adapter_resumed(&i2c->adap);
875868

876869
return 0;
877870
}

0 commit comments

Comments
 (0)