From patchwork Sat Feb 17 02:06:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 10225921 X-Patchwork-Delegate: horms@verge.net.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4FFAD601D4 for ; Sat, 17 Feb 2018 02:06:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30E1B296E9 for ; Sat, 17 Feb 2018 02:06:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2579D296EB; Sat, 17 Feb 2018 02:06:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCDEF296E9 for ; Sat, 17 Feb 2018 02:06:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750960AbeBQCGt (ORCPT ); Fri, 16 Feb 2018 21:06:49 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33591 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750948AbeBQCGs (ORCPT ); Fri, 16 Feb 2018 21:06:48 -0500 Received: by mail-wm0-f65.google.com with SMTP id x4so7724075wmc.0 for ; Fri, 16 Feb 2018 18:06:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=f1QjAvCqhZ7q4CxoXxpVNkLYPxDMlbMkSvdzBm2AFW0=; b=LMNUa3+1+Dt/BZCVNxVixJVhQctJI65GCjlx+50K4M6ZV2eeZHhwGo5RXC0sxUf7U5 cqaKVMjOK+leuHwoGaPSV8yjub7rrDdPpTgOnXellphlG+XaqIhJ8IfPPyGLwSD3KWQ6 tw+dflqsmY8NnZ7rzD7u+1AUWoRIbVL42hQAzUFHtEdZCbkHmXwXHCGeIttSYHYfHUZL qaQ3WZFOIk5mK+dHy4c6RulY+GdO/pD9ruThQVnnFPW1NYKIhaSwiZxGn/XcRxpE4Qxn 9J8paH7mNLdad7jD/byBP/8BAMAbWzgm94GKm+c30lNFfVpvR/42HeP99KpI20QPgFyx UcOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=f1QjAvCqhZ7q4CxoXxpVNkLYPxDMlbMkSvdzBm2AFW0=; b=JMmGVM33/9NQaoyPHP0FrWVZugm9/ez+QrWoXF2dFhRPk98kY/cCb8RKHv40bVKGlD 3CoBwMUL6s+0DJ5Yjz/La4suqjFWbZlzWeMccD36kZFmLSBLeE1qoU6Pyp8Zz5Zb2VgN MYaxGjfuVCZNTxTRbDlJzYiwzbEuMjxKGHyS23dB3ZV5oj68nsSLM+MYE+qJIZhQ0I0v s0PAJu70hpgUiW4HhGLLlrO2YM2sHhBCllS1yvWEgrPxpJ5n9v0hFPqR4DHBEsGXh1LY /xie3V2gVnQSxx37Qex0RWylNnOxxFAuZci5TA5gtCw9830kM+aqM3KXpOI5ZE9sBZII Mokw== X-Gm-Message-State: APf1xPBeH/BLzezP/RPNBeYdHBstedZGeW9ZpnSTMhi4dzIcbErMzl2Q VwQNy57UALEOz0hp0TqO2rc+eeQ8 X-Google-Smtp-Source: AH8x226GyN5VtgWFIpx2fJGJGdZA8hiJTAmUFQNsDTG1d9fxpr4noEmY2VPr7UgcylRg8kEdI4hi2Q== X-Received: by 10.28.136.19 with SMTP id k19mr6801311wmd.111.1518833207041; Fri, 16 Feb 2018 18:06:47 -0800 (PST) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id b65sm33195664wrd.26.2018.02.16.18.06.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Feb 2018 18:06:46 -0800 (PST) From: Marek Vasut X-Google-Original-From: Marek Vasut To: linux-renesas-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Marek Vasut , Geert Uytterhoeven , Kuninori Morimoto , Simon Horman , Wolfram Sang Subject: [PATCH 1/2] ARM: shmobile: Factor out complex condition Date: Sat, 17 Feb 2018 03:06:41 +0100 Message-Id: <20180217020642.21375-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.15.1 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Pull the complex condition in regulator_quirk_notify() into regulator_quirk_check(). Moreover, do not hard-code the I2C address, but rather use the one in da9xxx_msgs[]. Signed-off-by: Marek Vasut Cc: Geert Uytterhoeven Cc: Kuninori Morimoto Cc: Simon Horman Cc: Wolfram Sang --- arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c index 27fb3a5ec73e..862f7757ef5d 100644 --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c @@ -66,6 +66,13 @@ static struct i2c_msg da9xxx_msgs[3] = { }, }; +static int regulator_quirk_check(struct i2c_client *client, u8 i2c_id, + char *compat_string) +{ + return client->addr == da9xxx_msgs[i2c_id].addr && + !strcmp(client->name, compat_string); +} + static int regulator_quirk_notify(struct notifier_block *nb, unsigned long action, void *data) { @@ -88,9 +95,9 @@ static int regulator_quirk_notify(struct notifier_block *nb, client = to_i2c_client(dev); dev_dbg(dev, "Detected %s\n", client->name); - if ((client->addr == 0x58 && !strcmp(client->name, "da9063")) || - (client->addr == 0x68 && !strcmp(client->name, "da9210")) || - (client->addr == 0x70 && !strcmp(client->name, "da9210"))) { + if (regulator_quirk_check(client, 0, "da9063") || + regulator_quirk_check(client, 1, "da9210") || + regulator_quirk_check(client, 2, "da9210")) { int ret, len; /* There are two DA9210 on Stout, one on the other boards. */