Skip to content

Commit

Permalink
i2c: meson: use min instead of min_t where min_t isn't needed
Browse files Browse the repository at this point in the history
Use min instead of min_t where min_t isn't needed.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  • Loading branch information
Heiner Kallweit authored and Wolfram Sang committed Mar 30, 2017
1 parent 346e400 commit 8edf52a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/i2c/busses/i2c-meson.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,10 @@ static void meson_i2c_get_data(struct meson_i2c *i2c, char *buf, int len)
dev_dbg(i2c->dev, "%s: data %08x %08x len %d\n", __func__,
rdata0, rdata1, len);

for (i = 0; i < min_t(int, 4, len); i++)
for (i = 0; i < min(4, len); i++)
*buf++ = (rdata0 >> i * 8) & 0xff;

for (i = 4; i < min_t(int, 8, len); i++)
for (i = 4; i < min(8, len); i++)
*buf++ = (rdata1 >> (i - 4) * 8) & 0xff;
}

Expand All @@ -168,10 +168,10 @@ static void meson_i2c_put_data(struct meson_i2c *i2c, char *buf, int len)
u32 wdata0 = 0, wdata1 = 0;
int i;

for (i = 0; i < min_t(int, 4, len); i++)
for (i = 0; i < min(4, len); i++)
wdata0 |= *buf++ << (i * 8);

for (i = 4; i < min_t(int, 8, len); i++)
for (i = 4; i < min(8, len); i++)
wdata1 |= *buf++ << ((i - 4) * 8);

writel(wdata0, i2c->regs + REG_TOK_WDATA0);
Expand All @@ -186,7 +186,7 @@ static void meson_i2c_prepare_xfer(struct meson_i2c *i2c)
bool write = !(i2c->msg->flags & I2C_M_RD);
int i;

i2c->count = min_t(int, i2c->msg->len - i2c->pos, 8);
i2c->count = min(i2c->msg->len - i2c->pos, 8);

for (i = 0; i < i2c->count - 1; i++)
meson_i2c_add_token(i2c, TOKEN_DATA);
Expand Down

0 comments on commit 8edf52a

Please sign in to comment.