From patchwork Wed Nov 23 11:12:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 5289 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5621D23E07 for ; Wed, 23 Nov 2011 11:13:26 +0000 (UTC) Received: from mail-gx0-f180.google.com (mail-gx0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 1C62DA1866C for ; Wed, 23 Nov 2011 11:13:26 +0000 (UTC) Received: by ggnv5 with SMTP id v5so1710751ggn.11 for ; Wed, 23 Nov 2011 03:13:25 -0800 (PST) Received: by 10.152.104.1 with SMTP id ga1mr14068572lab.40.1322046804946; Wed, 23 Nov 2011 03:13:24 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs225891lal; Wed, 23 Nov 2011 03:13:24 -0800 (PST) Received: by 10.52.91.162 with SMTP id cf2mr25785916vdb.124.1322046802298; Wed, 23 Nov 2011 03:13:22 -0800 (PST) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe003.messaging.microsoft.com. [216.32.181.183]) by mx.google.com with ESMTPS id b2si3389985vcp.39.2011.11.23.03.13.21 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 Nov 2011 03:13:22 -0800 (PST) Received-SPF: neutral (google.com: 216.32.181.183 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=216.32.181.183; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.181.183 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail28-ch1-R.bigfish.com (10.43.68.254) by CH1EHSOBE010.bigfish.com (10.43.70.60) with Microsoft SMTP Server id 14.1.225.22; Wed, 23 Nov 2011 11:12:40 +0000 Received: from mail28-ch1 (localhost [127.0.0.1]) by mail28-ch1-R.bigfish.com (Postfix) with ESMTP id CE4AD2C0187; Wed, 23 Nov 2011 11:13:08 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail28-ch1 (localhost.localdomain [127.0.0.1]) by mail28-ch1 (MessageSwitch) id 1322046786611260_5547; Wed, 23 Nov 2011 11:13:06 +0000 (UTC) Received: from CH1EHSMHS020.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.241]) by mail28-ch1.bigfish.com (Postfix) with ESMTP id 8D0045A0044; Wed, 23 Nov 2011 11:13:06 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS020.bigfish.com (10.43.70.20) with Microsoft SMTP Server (TLS) id 14.1.225.22; Wed, 23 Nov 2011 11:12:37 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.339.2; Wed, 23 Nov 2011 05:13:17 -0600 Received: from b20223-02.ap.freescale.net (b20223-02.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id pANBDAMg008802; Wed, 23 Nov 2011 05:13:14 -0600 (CST) From: Richard Zhao To: CC: , , , , , , Subject: [RFC V1 1/8] clk: support static parent Date: Wed, 23 Nov 2011 19:12:28 +0800 Message-ID: <1322046755-13511-2-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1322046755-13511-1-git-send-email-richard.zhao@linaro.org> References: <1322046755-13511-1-git-send-email-richard.zhao@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com Signed-off-by: Richard Zhao --- drivers/clk/clk.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 85dabdb31..ed557c9 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -519,13 +519,11 @@ void clk_init(struct device *dev, struct clk *clk) mutex_lock(&prepare_lock); - if (clk->ops->get_parent) { + if (clk->ops->get_parent) clk->parent = clk->ops->get_parent(clk); - if (clk->parent) - hlist_add_head(&clk->child_node, - &clk->parent->children); - } else - clk->parent = NULL; + if (clk->parent) + hlist_add_head(&clk->child_node, + &clk->parent->children); if (clk->ops->recalc_rate) clk->rate = clk->ops->recalc_rate(clk);