From patchwork Sat Mar 11 18:22:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 737712 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vgXbc72gZz9s2s for ; Sun, 12 Mar 2017 05:24:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nGHn6W8W"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755391AbdCKSYo (ORCPT ); Sat, 11 Mar 2017 13:24:44 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33036 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754943AbdCKSYn (ORCPT ); Sat, 11 Mar 2017 13:24:43 -0500 Received: by mail-wm0-f68.google.com with SMTP id n11so3787744wma.0 for ; Sat, 11 Mar 2017 10:24:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=rLiBkkp51bqGa6BhlGzqGMeI0f8IYfnxUMpXqvNnHls=; b=nGHn6W8WhXVriFgGeTzea5TSll0OC7V5MUfmCx1yZUGpg1NWjMEbzSaWNluUropCh9 0zZaOv8k51aMcRv9SnV9jd2i94uX219BMSYwYnwh8IKJUvLDMdqT4s/CWQpTkbJDu4Uj 89roSf/t5cwuoRWqaVAEDvzH8muImSU83rBb7uhYuZCrGK7Ns+LewyPL2LSovXItCHOD qs7qU5jXWiDFbTslwa0VEqbNVzDXsP9tfDvGGV35yBUd+VpVV14NQPerz9SS9ylRGpcd hPVom8b1S6w7GNs0wtUxCVZCfwAlwa5SYpHXxVAbGg4UJ/DAB668wEWscopxsk5VRisb oWVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=rLiBkkp51bqGa6BhlGzqGMeI0f8IYfnxUMpXqvNnHls=; b=gMzdZ/w+iaOt9u673DOoEJecomVz8Q9DL8k0o2rPa00DBRKeG5XgRF248IaMGJa24H YPdwagyPtsHuT9ASWBHe4kTNBLTCrH62gxdPo65WMWdMJwlnfOH3M1tSYd8Ofk6zOAza V9HIMrWmhq0hg9Dm6j5pqbC1uw+8I2BbBdwVDTUWWjcFGixwu3lMcz3N345qt3PGCCoe ADw4LvYb/rmfoNfZfXjLvM+2OmVzfZbahfTpLz0J7QN2GW1+gwCf06Uijqr413v8A3Zl iDJvdi1vKpu5Dbd1xCv4HcEgudZEjLLbhtdVsH3cwuUD0r9/U4i98QC8b9Xu7Y1L0tNl JV2w== X-Gm-Message-State: AFeK/H2B5ZWWLOFymYXbhuPoB9pcQ3a+iaHurGLdXBOjxjNGoGqszinwNhpnh9o9DpSMAA== X-Received: by 10.28.101.68 with SMTP id z65mr3755152wmb.102.1489256681811; Sat, 11 Mar 2017 10:24:41 -0800 (PST) Received: from ?IPv6:2003:c6:ebdc:4000:3419:a191:120:8b2e? (p200300C6EBDC40003419A19101208B2E.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:3419:a191:120:8b2e]) by smtp.googlemail.com with ESMTPSA id k128sm4481832wmf.16.2017.03.11.10.24.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Mar 2017 10:24:41 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v3 01/10] i2c: meson: use min instead of min_t where min_t isn't needed To: Wolfram Sang , Jerome Brunet References: Cc: "linux-i2c@vger.kernel.org" , linux-amlogic@lists.infradead.org Message-ID: Date: Sat, 11 Mar 2017 19:22:46 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Use min instead of min_t where min_t isn't needed. Signed-off-by: Heiner Kallweit --- v2: - no changes v3: - 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);