iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2c: wmt: Reduce redundant: REG_CR setting

Browse Source 
These Settings for the same register, REG_CR,
can be put together to reduce code redundancy.

Signed-off-by: Hans Hu <hanshu-oc@zhaoxin.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
Hans Hu 2023-11-02 10:53:54 +08:00 committed by Wolfram Sang
parent 4c541c6a66
commit bb7c0209c4
1 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/i2c/busses/i2c-wmt.c
View File

@ -143,9 +143,6 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg,
if (!(pmsg->flags & I2C_M_NOSTART)) { if (!(pmsg->flags & I2C_M_NOSTART)) {
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);
val = readw(i2c_dev->base + REG_CR);
val |= CR_CPU_RDY; val |= CR_CPU_RDY;
writew(val, i2c_dev->base + REG_CR); writew(val, i2c_dev->base + REG_CR);
} }
@ -201,24 +198,15 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)
u32 xfer_len = 0; u32 xfer_len = 0;
val = readw(i2c_dev->base + REG_CR); val = readw(i2c_dev->base + REG_CR);
val &= ~CR_TX_END; val &= ~(CR_TX_END | CR_TX_NEXT_NO_ACK);
writew(val, i2c_dev->base + REG_CR);
val = readw(i2c_dev->base + REG_CR); if (!(pmsg->flags & I2C_M_NOSTART))
val &= ~CR_TX_NEXT_NO_ACK;
writew(val, i2c_dev->base + REG_CR);
if (!(pmsg->flags & I2C_M_NOSTART)) {
val = readw(i2c_dev->base + REG_CR);
val |= CR_CPU_RDY; val |= CR_CPU_RDY;
writew(val, i2c_dev->base + REG_CR);
}
if (pmsg->len == 1) { if (pmsg->len == 1)
val = readw(i2c_dev->base + REG_CR);
val |= CR_TX_NEXT_NO_ACK; val |= CR_TX_NEXT_NO_ACK;
writew(val, i2c_dev->base + REG_CR);
} writew(val, i2c_dev->base + REG_CR);
reinit_completion(&i2c_dev->complete); reinit_completion(&i2c_dev->complete);
@ -240,15 +228,10 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)
pmsg->buf[xfer_len] = readw(i2c_dev->base + REG_CDR) >> 8; pmsg->buf[xfer_len] = readw(i2c_dev->base + REG_CDR) >> 8;
xfer_len++; xfer_len++;
if (xfer_len == pmsg->len - 1) { val = readw(i2c_dev->base + REG_CR) | CR_CPU_RDY;
val = readw(i2c_dev->base + REG_CR); if (xfer_len == pmsg->len - 1)
val |= (CR_TX_NEXT_NO_ACK | CR_CPU_RDY); val |= CR_TX_NEXT_NO_ACK;
writew(val, i2c_dev->base + REG_CR); writew(val, i2c_dev->base + REG_CR);
} else {
val = readw(i2c_dev->base + REG_CR);
val |= CR_CPU_RDY;
writew(val, i2c_dev->base + REG_CR);
}
} }
return 0; return 0;