linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Heiner Kallweit <hkallweit1@gmail.com>
To: Wolfram Sang <wsa@the-dreams.de>, Jerome Brunet <jbrunet@baylibre.com>
Cc: "linux-i2c@vger.kernel.org" <linux-i2c@vger.kernel.org>,
	linux-amlogic@lists.infradead.org
Subject: [PATCH v2 01/10] i2c: meson: i2c: meson: use min instead of min_t where min_t isn't needed
Date: Thu, 9 Mar 2017 07:35:10 +0100	[thread overview]
Message-ID: <576f851e-9dda-8feb-1192-e5cddf4ab549@gmail.com> (raw)
In-Reply-To: <f39c9314-4314-3d98-aef2-3bc3c815e63b@gmail.com>

Use min instead of min_t where min_t isn't needed.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
v2:
- no changes
---
 drivers/i2c/busses/i2c-meson.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c
index 73b97c71..40e5da9a 100644
--- a/drivers/i2c/busses/i2c-meson.c
+++ b/drivers/i2c/busses/i2c-meson.c
@@ -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;
 }
 
@@ -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);
@@ -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);
-- 
2.12.0

  reply	other threads:[~2017-03-09  6:42 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-09  6:33 [PATCH v2 00/10] i2c: meson: series with improvements Heiner Kallweit
2017-03-09  6:35 ` Heiner Kallweit [this message]
2017-03-09  6:37 ` [PATCH v2 02/10] i2c: meson: remove member irq from struct meson_i2c Heiner Kallweit
2017-03-09  6:39 ` [PATCH v2 03/10] i2c: meson: use i2c core for DT clock-frequency parsing Heiner Kallweit
2017-03-09  8:26   ` Neil Armstrong
2017-03-09 20:13     ` Heiner Kallweit
2017-03-09  6:40 ` [PATCH v2 04/10] i2c: meson: use full 12 bits for clock divider Heiner Kallweit
2017-03-09  6:42 ` [PATCH v2 05/10] i2c: meson: set clock divider in probe instead of setting it for each transfer Heiner Kallweit
2017-03-10 23:17   ` Kevin Hilman
2017-03-10 23:36     ` Heiner Kallweit
2017-03-09  6:43 ` [PATCH v2 06/10] i2c: meson: remove variable count from meson_i2c_xfer Heiner Kallweit
2017-03-09  6:53 ` [PATCH v2 07/10] i2c: meson: improve interrupt handler and detect spurious interrupts Heiner Kallweit
2017-03-09  6:56 ` [PATCH v2 08/10] i2c: meson: don't create separate token chain just for the stop command Heiner Kallweit
2017-03-09  6:58 ` [PATCH v2 09/10] i2c: meson: remove meson_i2c_write_tokens Heiner Kallweit
2017-03-09  7:01 ` [PATCH v2 10/10] i2c: meson: improve and simplify interrupt handler Heiner Kallweit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=576f851e-9dda-8feb-1192-e5cddf4ab549@gmail.com \
    --to=hkallweit1@gmail.com \
    --cc=jbrunet@baylibre.com \
    --cc=linux-amlogic@lists.infradead.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=wsa@the-dreams.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).