i2c: kempld: Use i2c_10bit_addr_*_from_msg() helpers
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 13 Feb 2025 14:07:20 +0000 (16:07 +0200)
committerAndi Shyti <andi.shyti@kernel.org>
Tue, 18 Mar 2025 20:53:54 +0000 (21:53 +0100)
Use i2c_10bit_addr_*_from_msg() helpers instead of local copy.
No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250213141045.2716943-7-andriy.shevchenko@linux.intel.com
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
drivers/i2c/busses/i2c-kempld.c

index 212196af68ba7660c2f2576f38ba4a14dffb2b9b..9b4c7cba62b64c5557c257c32832eedf77db7142 100644 (file)
@@ -115,9 +115,7 @@ static int kempld_i2c_process(struct kempld_i2c_data *i2c)
        if (i2c->state == STATE_ADDR) {
                /* 10 bit address? */
                if (i2c->msg->flags & I2C_M_TEN) {
-                       addr = 0xf0 | ((i2c->msg->addr >> 7) & 0x6);
-                       /* Set read bit if necessary */
-                       addr |= (i2c->msg->flags & I2C_M_RD) ? 1 : 0;
+                       addr = i2c_10bit_addr_hi_from_msg(msg);
                        i2c->state = STATE_ADDR10;
                } else {
                        addr = i2c_8bit_addr_from_msg(i2c->msg);
@@ -132,10 +130,12 @@ static int kempld_i2c_process(struct kempld_i2c_data *i2c)
 
        /* Second part of 10 bit addressing */
        if (i2c->state == STATE_ADDR10) {
-               kempld_write8(pld, KEMPLD_I2C_DATA, i2c->msg->addr & 0xff);
+               addr = i2c_10bit_addr_lo_from_msg(msg);
+               i2c->state = STATE_START;
+
+               kempld_write8(pld, KEMPLD_I2C_DATA, addr);
                kempld_write8(pld, KEMPLD_I2C_CMD, I2C_CMD_WRITE);
 
-               i2c->state = STATE_START;
                return 0;
        }