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 --- a/drivers/i2c/busses/i2c-pxa.c
20 +++ b/drivers/i2c/busses/i2c-pxa.c
21 @@ -675,16 +675,6 @@ static void i2c_pxa_slave_stop(struct px
25 -static inline unsigned int i2c_pxa_addr_byte(struct i2c_msg *msg)
27 - unsigned int addr = (msg->addr & 0x7f) << 1;
29 - if (msg->flags & I2C_M_RD)
35 static inline void i2c_pxa_start_message(struct pxa_i2c *i2c)
38 @@ -692,8 +682,8 @@ static inline void i2c_pxa_start_message
40 * Step 1: target slave address into IDBR
42 - writel(i2c_pxa_addr_byte(i2c->msg), _IDBR(i2c));
43 - i2c->req_slave_addr = i2c_pxa_addr_byte(i2c->msg);
44 + i2c->req_slave_addr = i2c_8bit_addr_from_msg(i2c->msg);
45 + writel(i2c->req_slave_addr, _IDBR(i2c));
48 * Step 2: initiate the write.
49 @@ -1006,8 +996,8 @@ static void i2c_pxa_irq_txempty(struct p
51 * Write the next address.
53 - writel(i2c_pxa_addr_byte(i2c->msg), _IDBR(i2c));
54 - i2c->req_slave_addr = i2c_pxa_addr_byte(i2c->msg);
55 + i2c->req_slave_addr = i2c_8bit_addr_from_msg(i2c->msg);
56 + writel(i2c->req_slave_addr, _IDBR(i2c));
59 * And trigger a repeated start, and send the byte.