summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-emev2.c
diff options
context:
space:
mode:
authorPeter Rosin <peda@axentia.se>2018-05-16 09:16:47 +0200
committerWolfram Sang <wsa@the-dreams.de>2018-05-29 20:30:49 +0200
commit30a6475744cf11f31a296cb85b43bab40ebbea92 (patch)
tree655bc88b8866daf280ac5d3d14e07959499ccaf4 /drivers/i2c/busses/i2c-emev2.c
parenti2c: algos: make use of i2c_8bit_addr_from_msg (diff)
downloadlinux-30a6475744cf11f31a296cb85b43bab40ebbea92.tar.xz
linux-30a6475744cf11f31a296cb85b43bab40ebbea92.zip
i2c: busses: make use of i2c_8bit_addr_from_msg
Because it looks neater. For diolan, this allows factoring out some code that is now common between if and else. For eg20t, pch_i2c_writebytes is always called with a write in msgs->flags, and pch_i2c_readbytes with a read. For imx, i2c_imx_dma_write and i2c_imx_write are always called with a write in msgs->flags, and i2c_imx_read with a read. For qup, qup_i2c_write_tx_fifo_v1 is always called with a write in qup->msg->flags. For stu300, also restructure debug output for resends, since that code as a result is only handling debug output. Reviewed-by: Guenter Roeck <linux@roeck-us.net> [diolan] Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> [efm32 and imx] Acked-by: Linus Walleij <linus.walleij@linaro.org> [stu300] Signed-off-by: Peter Rosin <peda@axentia.se> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-emev2.c')
-rw-r--r--drivers/i2c/busses/i2c-emev2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-emev2.c b/drivers/i2c/busses/i2c-emev2.c
index d2e84480fbe9..ba9b6ea48a31 100644
--- a/drivers/i2c/busses/i2c-emev2.c
+++ b/drivers/i2c/busses/i2c-emev2.c
@@ -149,7 +149,7 @@ static int __em_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
em_clear_set_bit(priv, 0, I2C_BIT_STT0, I2C_OFS_IICC0);
/* Send slave address and R/W type */
- writeb((msg->addr << 1) | read, priv->base + I2C_OFS_IIC0);
+ writeb(i2c_8bit_addr_from_msg(msg), priv->base + I2C_OFS_IIC0);
/* Wait for transaction */
status = em_i2c_wait_for_event(priv);