From patchwork Thu May 2 06:25:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ambresh K X-Patchwork-Id: 2510291 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 2FF13DF215 for ; Thu, 2 May 2013 06:27:03 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXmyH-0001cV-Tx; Thu, 02 May 2013 06:26:26 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXmy5-0001s0-HL; Thu, 02 May 2013 06:26:13 +0000 Received: from arroyo.ext.ti.com ([192.94.94.40]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXmxx-0001pW-S3 for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2013 06:26:07 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r426Pnfc000721; Thu, 2 May 2013 01:25:49 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id r426PnG4031124; Thu, 2 May 2013 01:25:49 -0500 Received: from dlelxv23.itg.ti.com (172.17.1.198) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Thu, 2 May 2013 01:25:49 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id r426PnIZ028141; Thu, 2 May 2013 01:25:49 -0500 Received: from localhost (h83-1.vpn.ti.com [172.24.83.1]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id r426PjV17912; Thu, 2 May 2013 01:25:46 -0500 (CDT) From: Ambresh K To: Mike Turquette Subject: [Patch 3/3] clk: Avoid re-parenting orphan clk's having invalid parent index. Date: Thu, 2 May 2013 11:55:29 +0530 Message-ID: <1367475929-32166-4-git-send-email-ambresh@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1367475929-32166-1-git-send-email-ambresh@ti.com> References: <1367475929-32166-1-git-send-email-ambresh@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130502_022606_039905_DCE43E07 X-CRM114-Status: GOOD ( 11.34 ) X-Spam-Score: -9.5 (---------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-9.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [192.94.94.40 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -2.6 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Nishanth Menon , Rajendra , linux-kernel@vger.kernel.org, Tero Kristo , Ambresh K , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Ambresh K Add orhan clk nodes having invalid parent index to list and use the list to skip re-parenting orphan clk having invalid parents. Signed-off-by: Ambresh K --- drivers/clk/clk.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index f4d2c73..54d2aa3 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -32,6 +32,7 @@ static int enable_refcnt; static HLIST_HEAD(clk_root_list); static HLIST_HEAD(clk_orphan_list); +static HLIST_HEAD(clk_orphan_invalid_parent); static LIST_HEAD(clk_notifier_list); /*** locking ***/ @@ -1532,8 +1533,8 @@ EXPORT_SYMBOL_GPL(clk_set_parent); */ int __clk_init(struct device *dev, struct clk *clk) { - int i, ret = 0; - struct clk *orphan; + int i, ret = 0, skip = 0; + struct clk *orphan, *has_invalid_parent; struct hlist_node *tmp2; if (!clk) @@ -1639,11 +1640,27 @@ int __clk_init(struct device *dev, struct clk *clk) if (!strcmp(clk->name, orphan->name)) continue; + /* Skip iteration if orphan has invalid parent */ + hlist_for_each_entry(has_invalid_parent, + &clk_orphan_invalid_parent, child_node) { + if (!strcmp(orphan->name, has_invalid_parent->name)) { + skip = 1; + break; + } + } + + if (skip) { + skip = 0; + continue; + } + if (orphan->ops->get_parent) { i = orphan->ops->get_parent(orphan->hw); if (i < 0) { pr_err("%s: orphan clk(%s) invalid parent\n", __func__, orphan->name); + hlist_add_head(&orphan->child_node, + &clk_orphan_invalid_parent); continue; } if (!strcmp(clk->name, orphan->parent_names[i]))