Skip to content

Commit f2157d1

Browse files
andy-shevAndi Shyti
authored andcommitted
i2c: mv64xxx: Use i2c_*bit_addr*_from_msg() helpers
Use i2c_*bit_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-11-andriy.shevchenko@linux.intel.com Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
1 parent 2ee4415 commit f2157d1

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

drivers/i2c/busses/i2c-mv64xxx.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <linux/err.h>
2828
#include <linux/delay.h>
2929

30-
#define MV64XXX_I2C_ADDR_ADDR(val) ((val & 0x7f) << 1)
3130
#define MV64XXX_I2C_BAUD_DIV_N(val) (val & 0x7)
3231
#define MV64XXX_I2C_BAUD_DIV_M(val) ((val & 0xf) << 3)
3332

@@ -176,22 +175,17 @@ static void
176175
mv64xxx_i2c_prepare_for_io(struct mv64xxx_i2c_data *drv_data,
177176
struct i2c_msg *msg)
178177
{
179-
u32 dir = 0;
180-
181178
drv_data->cntl_bits = MV64XXX_I2C_REG_CONTROL_ACK |
182179
MV64XXX_I2C_REG_CONTROL_TWSIEN;
183180

184181
if (!drv_data->atomic)
185182
drv_data->cntl_bits |= MV64XXX_I2C_REG_CONTROL_INTEN;
186183

187-
if (msg->flags & I2C_M_RD)
188-
dir = 1;
189-
190184
if (msg->flags & I2C_M_TEN) {
191-
drv_data->addr1 = 0xf0 | (((u32)msg->addr & 0x300) >> 7) | dir;
192-
drv_data->addr2 = (u32)msg->addr & 0xff;
185+
drv_data->addr1 = i2c_10bit_addr_hi_from_msg(msg);
186+
drv_data->addr2 = i2c_10bit_addr_lo_from_msg(msg);
193187
} else {
194-
drv_data->addr1 = MV64XXX_I2C_ADDR_ADDR((u32)msg->addr) | dir;
188+
drv_data->addr1 = i2c_8bit_addr_from_msg(msg);
195189
drv_data->addr2 = 0;
196190
}
197191
}

0 commit comments

Comments
 (0)