Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755600AbbBFTnt (ORCPT ); Fri, 6 Feb 2015 14:43:49 -0500 Received: from smtp.codeaurora.org ([198.145.11.231]:52824 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754007AbbBFTms (ORCPT ); Fri, 6 Feb 2015 14:42:48 -0500 From: Stephen Boyd To: Mike Turquette , Stephen Boyd Cc: linux-kernel@vger.kernel.org, Tomeu Vizoso , Alban Browaeys Subject: [PATCH v2 2/3] clk: Rename child_node to clks_node to avoid confusion Date: Fri, 6 Feb 2015 11:42:44 -0800 Message-Id: <1423251765-2947-3-git-send-email-sboyd@codeaurora.org> X-Mailer: git-send-email 2.3.0.rc1.33.g42e4583 In-Reply-To: <1423251765-2947-1-git-send-email-sboyd@codeaurora.org> References: <1423251765-2947-1-git-send-email-sboyd@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2505 Lines: 75 The child_node member of struct clk is named the same as the child_node member of struct clk_core. Let's rename the struct clk's member to clks_node to avoid getting confused with the child_node member of struct clk_core and to match the name of the list head, clks. Reviewed-by: Tomeu Vizoso Cc: Alban Browaeys Signed-off-by: Stephen Boyd --- drivers/clk/clk.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 5469d7714f5d..315dc22b7356 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -83,7 +83,7 @@ struct clk { const char *con_id; unsigned long min_rate; unsigned long max_rate; - struct hlist_node child_node; + struct hlist_node clks_node; }; /*** locking ***/ @@ -851,10 +851,10 @@ static void clk_core_get_boundaries(struct clk_core *clk, *min_rate = 0; *max_rate = ULONG_MAX; - hlist_for_each_entry(clk_user, &clk->clks, child_node) + hlist_for_each_entry(clk_user, &clk->clks, clks_node) *min_rate = max(*min_rate, clk_user->min_rate); - hlist_for_each_entry(clk_user, &clk->clks, child_node) + hlist_for_each_entry(clk_user, &clk->clks, clks_node) *max_rate = min(*max_rate, clk_user->max_rate); } @@ -2376,7 +2376,7 @@ struct clk *__clk_create_clk(struct clk_hw *hw, const char *dev_id, clk->max_rate = ULONG_MAX; clk_prepare_lock(); - hlist_add_head(&clk->child_node, &hw->core->clks); + hlist_add_head(&clk->clks_node, &hw->core->clks); clk_prepare_unlock(); return clk; @@ -2385,7 +2385,7 @@ struct clk *__clk_create_clk(struct clk_hw *hw, const char *dev_id, void __clk_free_clk(struct clk *clk) { clk_prepare_lock(); - hlist_del(&clk->child_node); + hlist_del(&clk->clks_node); clk_prepare_unlock(); kfree(clk); @@ -2663,7 +2663,7 @@ void __clk_put(struct clk *clk) clk_prepare_lock(); - hlist_del(&clk->child_node); + hlist_del(&clk->clks_node); clk_core_set_rate_nolock(clk->core, clk->core->req_rate); owner = clk->core->owner; kref_put(&clk->core->ref, __clk_release); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project -- 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/