Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932176AbbDOOoM (ORCPT ); Wed, 15 Apr 2015 10:44:12 -0400 Received: from mail-bn1bon0146.outbound.protection.outlook.com ([157.56.111.146]:15008 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752289AbbDOOoE (ORCPT ); Wed, 15 Apr 2015 10:44:04 -0400 X-Greylist: delayed 874 seconds by postgrey-1.27 at vger.kernel.org; Wed, 15 Apr 2015 10:44:03 EDT Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; From: Dong Aisheng To: CC: , , , , , , , , , Subject: [PATCH RFC v1 1/5] clk: change clk_core name of __clk_set_parent_after Date: Wed, 15 Apr 2015 22:26:35 +0800 Message-ID: <1429107999-24413-2-git-send-email-aisheng.dong@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429107999-24413-1-git-send-email-aisheng.dong@freescale.com> References: <1429107999-24413-1-git-send-email-aisheng.dong@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;BMV:1;SFV:NSPM;SFS:(10019020)(6009001)(339900001)(189002)(199003)(19580395003)(50466002)(47776003)(85426001)(6806004)(19580405001)(92566002)(50986999)(76176999)(50226001)(48376002)(86362001)(2950100001)(46102003)(33646002)(104016003)(110136001)(229853001)(87936001)(106466001)(105606002)(77156002)(62966003)(77096005)(2351001)(36756003)(4001430100001)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM2PR0301MB1232;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;MLV:sfv;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1232; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(5002010);SRVR:DM2PR0301MB1232;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1232; X-Forefront-PRVS: 0547116B72 X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2015 14:29:28.8121 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB1232 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1419 Lines: 42 To align with __clk_set_parent_before and some others functions, change the host clk name to 'clk' instead of 'core'. Cc: Mike Turquette Cc: Stephen Boyd Signed-off-by: Dong Aisheng --- drivers/clk/clk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 459ce9d..cc56ba2 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1487,7 +1487,7 @@ static struct clk_core *__clk_set_parent_before(struct clk_core *clk, return old_parent; } -static void __clk_set_parent_after(struct clk_core *core, +static void __clk_set_parent_after(struct clk_core *clk, struct clk_core *parent, struct clk_core *old_parent) { @@ -1495,8 +1495,8 @@ static void __clk_set_parent_after(struct clk_core *core, * Finish the migration of prepare state and undo the changes done * for preventing a race with clk_enable(). */ - if (core->prepare_count) { - clk_core_disable(core); + if (clk->prepare_count) { + clk_core_disable(clk); clk_core_disable(old_parent); clk_core_unprepare(old_parent); } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/