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: 2510271 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2A549DF215 for ; Thu, 2 May 2013 06:26:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755399Ab3EBG03 (ORCPT ); Thu, 2 May 2013 02:26:29 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:56716 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753299Ab3EBG0H (ORCPT ); Thu, 2 May 2013 02:26:07 -0400 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 CC: , , , Tero Kristo , Rajendra , Ambresh K , Nishanth Menon 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 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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]))