Commit 462e9804 authored by Hans Hu's avatar Hans Hu Committed by Wolfram Sang

i2c: wmt: Reduce redundant: bus busy check

Put wmt_i2c_wait_bus_not_busy() in a more appropriate place
to reduce code redundancy
Signed-off-by: default avatarHans Hu <hanshu-oc@zhaoxin.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent a8355235
...@@ -128,12 +128,6 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg, ...@@ -128,12 +128,6 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg,
unsigned long wait_result; unsigned long wait_result;
int xfer_len = 0; int xfer_len = 0;
if (!(pmsg->flags & I2C_M_NOSTART)) {
ret = wmt_i2c_wait_bus_not_busy(i2c_dev);
if (ret < 0)
return ret;
}
if (pmsg->len == 0) { if (pmsg->len == 0) {
/* /*
* We still need to run through the while (..) once, so * We still need to run through the while (..) once, so
...@@ -219,12 +213,6 @@ static int wmt_i2c_read(struct i2c_adapter *adap, struct i2c_msg *pmsg, ...@@ -219,12 +213,6 @@ static int wmt_i2c_read(struct i2c_adapter *adap, struct i2c_msg *pmsg,
unsigned long wait_result; unsigned long wait_result;
u32 xfer_len = 0; u32 xfer_len = 0;
if (!(pmsg->flags & I2C_M_NOSTART)) {
ret = wmt_i2c_wait_bus_not_busy(i2c_dev);
if (ret < 0)
return ret;
}
val = readw(i2c_dev->base + REG_CR); val = readw(i2c_dev->base + REG_CR);
val &= ~CR_TX_END; val &= ~CR_TX_END;
writew(val, i2c_dev->base + REG_CR); writew(val, i2c_dev->base + REG_CR);
...@@ -297,11 +285,18 @@ static int wmt_i2c_xfer(struct i2c_adapter *adap, ...@@ -297,11 +285,18 @@ static int wmt_i2c_xfer(struct i2c_adapter *adap,
struct i2c_msg *pmsg; struct i2c_msg *pmsg;
int i, is_last; int i, is_last;
int ret = 0; int ret = 0;
struct wmt_i2c_dev *i2c_dev = i2c_get_adapdata(adap);
for (i = 0; ret >= 0 && i < num; i++) { for (i = 0; ret >= 0 && i < num; i++) {
is_last = ((i + 1) == num); is_last = ((i + 1) == num);
pmsg = &msgs[i]; pmsg = &msgs[i];
if (!(pmsg->flags & I2C_M_NOSTART)) {
ret = wmt_i2c_wait_bus_not_busy(i2c_dev);
if (ret < 0)
return ret;
}
if (pmsg->flags & I2C_M_RD) if (pmsg->flags & I2C_M_RD)
ret = wmt_i2c_read(adap, pmsg, is_last); ret = wmt_i2c_read(adap, pmsg, is_last);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment