From patchwork Fri May 6 00:29:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 67247 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp58903qge; Thu, 5 May 2016 17:32:12 -0700 (PDT) X-Received: by 10.66.134.15 with SMTP id pg15mr24497832pab.98.1462494732008; Thu, 05 May 2016 17:32:12 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n76si13984455pfa.84.2016.05.05.17.32.11; Thu, 05 May 2016 17:32:11 -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 S1757778AbcEFAaD (ORCPT + 29 others); Thu, 5 May 2016 20:30:03 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:41733 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757621AbcEFAaA (ORCPT ); Thu, 5 May 2016 20:30:00 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id u460TsJP023975; Thu, 5 May 2016 19:29:54 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id u460TsLi018673; 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 u460Tr8W021283; 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 4/4] regulator: tps65917/palmas: Simplify multiple dereference of match->of_node Date: Thu, 5 May 2016 19:29:52 -0500 Message-ID: <1462494592-27909-5-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 Just dereference match->of_node once instead of using match->of_node. Signed-off-by: Nishanth Menon --- drivers/regulator/palmas-regulator.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) -- 2.8.0 diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index faa389be7ca3..f11d41dad9c1 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -1493,10 +1493,12 @@ static int palmas_dt_to_pdata(struct device *dev, for (idx = 0; idx < ddata->max_reg; idx++) { static struct of_regulator_match *match; struct palmas_reg_init *rinit; + struct device_node *np; match = &ddata->palmas_matches[idx]; + np = match->of_node; - if (!match->init_data || !match->of_node) + if (!match->init_data || !np) continue; rinit = devm_kzalloc(dev, sizeof(*rinit), GFP_KERNEL); @@ -1506,11 +1508,8 @@ static int palmas_dt_to_pdata(struct device *dev, pdata->reg_data[idx] = match->init_data; pdata->reg_init[idx] = rinit; - rinit->warm_reset = of_property_read_bool(match->of_node, - "ti,warm-reset"); - - ret = of_property_read_u32(match->of_node, "ti,roof-floor", - &prop); + rinit->warm_reset = of_property_read_bool(np, "ti,warm-reset"); + ret = of_property_read_u32(np, "ti,roof-floor", &prop); /* EINVAL: Property not found */ if (ret != -EINVAL) { int econtrol; @@ -1539,19 +1538,17 @@ static int palmas_dt_to_pdata(struct device *dev, rinit->roof_floor = econtrol; } - ret = of_property_read_u32(match->of_node, "ti,mode-sleep", - &prop); + ret = of_property_read_u32(np, "ti,mode-sleep", &prop); if (!ret) rinit->mode_sleep = prop; - ret = of_property_read_bool(match->of_node, "ti,smps-range"); + ret = of_property_read_bool(np, "ti,smps-range"); if (ret) rinit->vsel = PALMAS_SMPS12_VOLTAGE_RANGE; if (idx == PALMAS_REG_LDO8) pdata->enable_ldo8_tracking = of_property_read_bool( - match->of_node, - "ti,enable-ldo8-tracking"); + np, "ti,enable-ldo8-tracking"); } pdata->ldo6_vibrator = of_property_read_bool(node, "ti,ldo6-vibrator");