1 From: Russell King <rmk+kernel@armlinux.org.uk>
2 Bcc: linux@mail.armlinux.org.uk
3 Cc: linux-i2c@vger.kernel.org
4 Subject: [PATCH 01/17] i2c: pxa: use official address byte helper
6 Content-Disposition: inline
7 Content-Transfer-Encoding: 8bit
8 Content-Type: text/plain; charset="utf-8"
10 i2c-pxa was created before i2c_8bit_addr_from_msg() was implemented,
11 and used its own i2c_pxa_addr_byte() which is functionally the same.
12 Sadly, it was never updated to use this new helper. Switch it over.
14 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
16 drivers/i2c/busses/i2c-pxa.c | 21 +++++++--------------
17 1 file changed, 7 insertions(+), 14 deletions(-)
19 diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
20 index 2c3c3d6935c0..966000923e8e 100644
21 --- a/drivers/i2c/busses/i2c-pxa.c
22 +++ b/drivers/i2c/busses/i2c-pxa.c
23 @@ -675,16 +675,6 @@ static void i2c_pxa_slave_stop(struct pxa_i2c *i2c)
27 -static inline unsigned int i2c_pxa_addr_byte(struct i2c_msg *msg)
29 - unsigned int addr = (msg->addr & 0x7f) << 1;
31 - if (msg->flags & I2C_M_RD)
37 static inline void i2c_pxa_start_message(struct pxa_i2c *i2c)
40 @@ -693,8 +683,8 @@ static inline void i2c_pxa_start_message(struct pxa_i2c *i2c)
42 * Step 1: target slave address into IDBR
44 - writel(i2c_pxa_addr_byte(i2c->msg), _IDBR(i2c));
45 - i2c->req_slave_addr = i2c_pxa_addr_byte(i2c->msg);
46 + i2c->req_slave_addr = i2c_8bit_addr_from_msg(i2c->msg);
47 + writel(i2c->req_slave_addr, _IDBR(i2c));
50 * Step 2: initiate the write.
51 @@ -1006,8 +999,8 @@ static void i2c_pxa_irq_txempty(struct pxa_i2c *i2c, u32 isr)
53 * Write the next address.
55 - writel(i2c_pxa_addr_byte(i2c->msg), _IDBR(i2c));
56 - i2c->req_slave_addr = i2c_pxa_addr_byte(i2c->msg);
57 + i2c->req_slave_addr = i2c_8bit_addr_from_msg(i2c->msg);
58 + writel(i2c->req_slave_addr, _IDBR(i2c));
61 * And trigger a repeated start, and send the byte.