From patchwork Fri May 6 00:29:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 67243 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp58323qge; Thu, 5 May 2016 17:30:19 -0700 (PDT) X-Received: by 10.98.104.6 with SMTP id d6mr24465807pfc.77.1462494618980; Thu, 05 May 2016 17:30:18 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pk5si8815742pab.73.2016.05.05.17.30.18; Thu, 05 May 2016 17:30:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757928AbcEFAaL (ORCPT + 29 others); Thu, 5 May 2016 20:30:11 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:59156 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757623AbcEFAaA (ORCPT ); Thu, 5 May 2016 20:30:00 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id u460Tsem024121; Thu, 5 May 2016 19:29:54 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id u460TsTX011708; Thu, 5 May 2016 19:29:54 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Thu, 5 May 2016 19:29:53 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id u460TrO0021278; Thu, 5 May 2016 19:29:53 -0500 From: Nishanth Menon To: Tony Lindgren CC: , , Mark Brown , Liam Girdwood , Keerthy , Stephen Warren , Laxman Dewangan , Nishanth Menon Subject: [PATCH 1/4] regulator: tps65917/palmas: Simplify multiple dereference of ddata->palmas_matches[idx] Date: Thu, 5 May 2016 19:29:49 -0500 Message-ID: <1462494592-27909-2-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1462494592-27909-1-git-send-email-nm@ti.com> References: <1462494592-27909-1-git-send-email-nm@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Converting dt to platform data logic involves picking up information that is unique per regulator, however we can improve readability of the code by dereferencing ddata->palmas_matches[idx] once in the loop. While at it fix reuse of generic palmas_matches common variable while reporting error for a specific regulator (which may be from 65917/palmas list). Signed-off-by: Nishanth Menon --- drivers/regulator/palmas-regulator.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) -- 2.8.0 diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index c83e06b2cedb..41b4e94a8d7d 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -1491,21 +1491,23 @@ static void palmas_dt_to_pdata(struct device *dev, } for (idx = 0; idx < ddata->max_reg; idx++) { - if (!ddata->palmas_matches[idx].init_data || - !ddata->palmas_matches[idx].of_node) + static struct of_regulator_match *match; + + match = &ddata->palmas_matches[idx]; + + if (!match->init_data || !match->of_node) continue; - pdata->reg_data[idx] = ddata->palmas_matches[idx].init_data; + pdata->reg_data[idx] = match->init_data; pdata->reg_init[idx] = devm_kzalloc(dev, sizeof(struct palmas_reg_init), GFP_KERNEL); pdata->reg_init[idx]->warm_reset = - of_property_read_bool(ddata->palmas_matches[idx].of_node, - "ti,warm-reset"); + of_property_read_bool(match->of_node, "ti,warm-reset"); - ret = of_property_read_u32(ddata->palmas_matches[idx].of_node, - "ti,roof-floor", &prop); + ret = of_property_read_u32(match->of_node, "ti,roof-floor", + &prop); /* EINVAL: Property not found */ if (ret != -EINVAL) { int econtrol; @@ -1527,27 +1529,26 @@ static void palmas_dt_to_pdata(struct device *dev, WARN_ON(1); dev_warn(dev, "%s: Invalid roof-floor option: %u\n", - palmas_matches[idx].name, prop); + match->name, prop); break; } } pdata->reg_init[idx]->roof_floor = econtrol; } - ret = of_property_read_u32(ddata->palmas_matches[idx].of_node, - "ti,mode-sleep", &prop); + ret = of_property_read_u32(match->of_node, "ti,mode-sleep", + &prop); if (!ret) pdata->reg_init[idx]->mode_sleep = prop; - ret = of_property_read_bool(ddata->palmas_matches[idx].of_node, - "ti,smps-range"); + ret = of_property_read_bool(match->of_node, "ti,smps-range"); if (ret) pdata->reg_init[idx]->vsel = PALMAS_SMPS12_VOLTAGE_RANGE; if (idx == PALMAS_REG_LDO8) pdata->enable_ldo8_tracking = of_property_read_bool( - ddata->palmas_matches[idx].of_node, + match->of_node, "ti,enable-ldo8-tracking"); }