i2c: rzv2m: Use i2c_10bit_addr_*_from_msg() helpers
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 13 Feb 2025 14:07:22 +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-9-andriy.shevchenko@linux.intel.com
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
drivers/i2c/busses/i2c-rzv2m.c

index 02b76e24a4769805e33c75c7d59dab5ff6751f64..53762cc56d284abffaabf63e2c8a7eb8b3188d23 100644 (file)
@@ -287,20 +287,15 @@ static int rzv2m_i2c_send_address(struct rzv2m_i2c_priv *priv,
        int ret;
 
        if (msg->flags & I2C_M_TEN) {
-               /*
-                * 10-bit address
-                *   addr_1: 5'b11110 | addr[9:8] | (R/nW)
-                *   addr_2: addr[7:0]
-                */
-               addr = 0xf0 | ((msg->addr & GENMASK(9, 8)) >> 7);
-               addr |= !!(msg->flags & I2C_M_RD);
-               /* Send 1st address(extend code) */
+               /* 10-bit address: Send 1st address(extend code) */
+               addr = i2c_10bit_addr_hi_from_msg(msg);
                ret = rzv2m_i2c_write_with_ack(priv, addr);
                if (ret)
                        return ret;
 
-               /* Send 2nd address */
-               ret = rzv2m_i2c_write_with_ack(priv, msg->addr & 0xff);
+               /* 10-bit address: Send 2nd address */
+               addr = i2c_10bit_addr_lo_from_msg(msg);
+               ret = rzv2m_i2c_write_with_ack(priv, addr);
        } else {
                /* 7-bit address */
                addr = i2c_8bit_addr_from_msg(msg);