From patchwork Fri Sep 4 08:17:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 53066 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id 8168022E23 for ; Fri, 4 Sep 2015 08:17:52 +0000 (UTC) Received: by wicuu12 with SMTP id uu12sf3598336wic.2 for ; Fri, 04 Sep 2015 01:17:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=qkNSCwes2fQ4+1fUY1RUyrZ0XnfaCamEQmDYUQNqDvI=; b=LkSh8QUsc/0y4etD7bpQkB8N+U/m0vz0JQmlyE+j3pqAjtNDqal0DZgkFhmXVNjvZn hpmchj/5qNJSGDpMdWjEVY4QN3B3TUhCtXscdf0d0JkujZAPAxRrWIttMeuace5gvUao VOd9lPGc4/stMTmJe9QxE76lzYeRn9EaVMbLqypvP8OyPbVOYy0Wko9pT7x8sZDo79g1 /+bXktWFuEoW3GnI9PbsL+KoCg05SVlavBjQfys+4AzJzIXSXiyCiijLSR5spfqdztSM r6zDGqNpOwTgpAtmicWRYL4+ewtwv8urTgGr17JsUt8NSGDTqiQotbq/eybghwOxBoT9 m93A== X-Gm-Message-State: ALoCoQkmRpQPNhxnTJtWfUKxIq1WyOGSw7MP4qQtDgCXVFgy/Tx/pwGN/+GbWy/X6nCM5qUDzDlY X-Received: by 10.180.82.101 with SMTP id h5mr746972wiy.1.1441354671830; Fri, 04 Sep 2015 01:17:51 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.219.4 with SMTP id pk4ls318737lac.90.gmail; Fri, 04 Sep 2015 01:17:51 -0700 (PDT) X-Received: by 10.112.64.228 with SMTP id r4mr1003800lbs.80.1441354671528; Fri, 04 Sep 2015 01:17:51 -0700 (PDT) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id d2si1598501laa.142.2015.09.04.01.17.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Sep 2015 01:17:51 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by lbpo4 with SMTP id o4so7111233lbp.2 for ; Fri, 04 Sep 2015 01:17:51 -0700 (PDT) X-Received: by 10.112.169.66 with SMTP id ac2mr1260108lbc.32.1441354671372; Fri, 04 Sep 2015 01:17:51 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.164.42 with SMTP id yn10csp1779262lbb; Fri, 4 Sep 2015 01:17:50 -0700 (PDT) X-Received: by 10.68.184.197 with SMTP id ew5mr5682711pbc.145.1441354670008; Fri, 04 Sep 2015 01:17:50 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id uy4si1696878pbc.109.2015.09.04.01.17.48; Fri, 04 Sep 2015 01:17:49 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756808AbbIDIRp (ORCPT + 28 others); Fri, 4 Sep 2015 04:17:45 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:36050 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753215AbbIDIRm (ORCPT ); Fri, 4 Sep 2015 04:17:42 -0400 Received: by pacwi10 with SMTP id wi10so17509175pac.3 for ; Fri, 04 Sep 2015 01:17:41 -0700 (PDT) X-Received: by 10.68.218.104 with SMTP id pf8mr5727267pbc.31.1441354661179; Fri, 04 Sep 2015 01:17:41 -0700 (PDT) Received: from localhost ([122.171.186.190]) by smtp.gmail.com with ESMTPSA id gw3sm1541609pbc.46.2015.09.04.01.17.39 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 04 Sep 2015 01:17:40 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , sboyd@codeaurora.org Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, nm@ti.com, Viresh Kumar , Greg Kroah-Hartman , Len Brown , linux-kernel@vger.kernel.org (open list), Pavel Machek Subject: [PATCH V3 1/6] PM / OPP: reuse of_parse_phandle() Date: Fri, 4 Sep 2015 13:47:22 +0530 Message-Id: <6e9bebac1fd64de67d2f420eaa86e45716acfe8f.1441354424.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , We already have a better API to get the opp descriptor block's node from cpu-node. Lets reuse that instead of creating our own routines for the same stuff. That cleans the code a lot. This also kills a check we had earlier (as we are using the generic API now). Earlier we used to check if the operating-points-v2 property contained multiple phandles instead of a single phandle. Killing this check isn't an issue because, we only parse the first entry with of_parse_phandle(). So, if a user passes multiple phandles, its really his problem :) Reviewed-by: Stephen Boyd Signed-off-by: Viresh Kumar --- drivers/base/power/opp.c | 71 ++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 54 deletions(-) diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index eb254497a494..4741fdc13e83 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c @@ -1253,69 +1253,33 @@ void of_cpumask_free_opp_table(cpumask_var_t cpumask) } EXPORT_SYMBOL_GPL(of_cpumask_free_opp_table); -/* Returns opp descriptor node from its phandle. Caller must do of_node_put() */ -static struct device_node * -_of_get_opp_desc_node_from_prop(struct device *dev, const struct property *prop) -{ - struct device_node *opp_np; - - opp_np = of_find_node_by_phandle(be32_to_cpup(prop->value)); - if (!opp_np) { - dev_err(dev, "%s: Prop: %s contains invalid opp desc phandle\n", - __func__, prop->name); - return ERR_PTR(-EINVAL); - } - - return opp_np; -} - -/* Returns opp descriptor node for a device. Caller must do of_node_put() */ +/* Returns opp descriptor node for a device, caller must do of_node_put() */ static struct device_node *_of_get_opp_desc_node(struct device *dev) { - const struct property *prop; - - prop = of_find_property(dev->of_node, "operating-points-v2", NULL); - if (!prop) - return ERR_PTR(-ENODEV); - if (!prop->value) - return ERR_PTR(-ENODATA); - /* * TODO: Support for multiple OPP tables. * * There should be only ONE phandle present in "operating-points-v2" * property. */ - if (prop->length != sizeof(__be32)) { - dev_err(dev, "%s: Invalid opp desc phandle\n", __func__); - return ERR_PTR(-EINVAL); - } - return _of_get_opp_desc_node_from_prop(dev, prop); + return of_parse_phandle(dev->of_node, "operating-points-v2", 0); } /* Initializes OPP tables based on new bindings */ static int _of_init_opp_table_v2(struct device *dev, - const struct property *prop) + struct device_node *opp_np) { - struct device_node *opp_np, *np; + struct device_node *np; struct device_opp *dev_opp; int ret = 0, count = 0; - if (!prop->value) - return -ENODATA; - - /* Get opp node */ - opp_np = _of_get_opp_desc_node_from_prop(dev, prop); - if (IS_ERR(opp_np)) - return PTR_ERR(opp_np); - dev_opp = _managed_opp(opp_np); if (dev_opp) { /* OPPs are already managed */ if (!_add_list_dev(dev, dev_opp)) ret = -ENOMEM; - goto put_opp_np; + return ret; } /* We have opp-list node now, iterate over it and add OPPs */ @@ -1331,10 +1295,8 @@ static int _of_init_opp_table_v2(struct device *dev, } /* There should be one of more OPP defined */ - if (WARN_ON(!count)) { - ret = -ENOENT; - goto put_opp_np; - } + if (WARN_ON(!count)) + return -ENOENT; dev_opp = _find_device_opp(dev); if (WARN_ON(IS_ERR(dev_opp))) { @@ -1345,13 +1307,10 @@ static int _of_init_opp_table_v2(struct device *dev, dev_opp->np = opp_np; dev_opp->shared_opp = of_property_read_bool(opp_np, "opp-shared"); - of_node_put(opp_np); return 0; free_table: of_free_opp_table(dev); -put_opp_np: - of_node_put(opp_np); return ret; } @@ -1418,14 +1377,15 @@ static int _of_init_opp_table_v1(struct device *dev) */ int of_init_opp_table(struct device *dev) { - const struct property *prop; + struct device_node *opp_np; + int ret; /* * OPPs have two version of bindings now. The older one is deprecated, * try for the new binding first. */ - prop = of_find_property(dev->of_node, "operating-points-v2", NULL); - if (!prop) { + opp_np = _of_get_opp_desc_node(dev); + if (!opp_np) { /* * Try old-deprecated bindings for backward compatibility with * older dtbs. @@ -1433,7 +1393,10 @@ int of_init_opp_table(struct device *dev) return _of_init_opp_table_v1(dev); } - return _of_init_opp_table_v2(dev, prop); + ret = _of_init_opp_table_v2(dev, opp_np); + of_node_put(opp_np); + + return ret; } EXPORT_SYMBOL_GPL(of_init_opp_table); @@ -1522,7 +1485,7 @@ int of_get_cpus_sharing_opps(struct device *cpu_dev, cpumask_var_t cpumask) /* Get OPP descriptor node */ np = _of_get_opp_desc_node(cpu_dev); - if (IS_ERR(np)) { + if (!np) { dev_dbg(cpu_dev, "%s: Couldn't find opp node: %ld\n", __func__, PTR_ERR(np)); return -ENOENT; @@ -1546,7 +1509,7 @@ int of_get_cpus_sharing_opps(struct device *cpu_dev, cpumask_var_t cpumask) /* Get OPP descriptor node */ tmp_np = _of_get_opp_desc_node(tcpu_dev); - if (IS_ERR(tmp_np)) { + if (!tmp_np) { dev_err(tcpu_dev, "%s: Couldn't find opp node: %ld\n", __func__, PTR_ERR(tmp_np)); ret = PTR_ERR(tmp_np);