From patchwork Mon Sep 14 03:01:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Ignacio Zurita X-Patchwork-Id: 47217 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8E323p5001301 for ; Mon, 14 Sep 2009 03:02:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754877AbZINDB6 (ORCPT ); Sun, 13 Sep 2009 23:01:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755135AbZINDB6 (ORCPT ); Sun, 13 Sep 2009 23:01:58 -0400 Received: from smtp103.prem.mail.ac4.yahoo.com ([76.13.13.42]:43341 "HELO smtp103.prem.mail.ac4.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754877AbZINDB6 (ORCPT ); Sun, 13 Sep 2009 23:01:58 -0400 Received: (qmail 75388 invoked from network); 14 Sep 2009 03:02:01 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:Date:From:To:Cc:Subject:Message-ID:Reply-To:MIME-Version:Content-Type:Content-Disposition:Sender:User-Agent; b=WmiLBVvxwPtGGF9xgVKKRSEpvSm8LVTOVq6IFXRlgWEFWB8Fk6vxzwRoVvVrIc+diw7Zrbq2Hwrmx6Zab/p/0V0LK0v4LPwBzgskmJkyKSqCDYVG5d3oXwcOA6II2Zv7cdgsWbDJYxWr8ChyBJve5h1xRYt8t+BzzKIS7ZLADEU= ; Received: from customer-static-123-158-181.iplannetworks.net (rizurita@200.123.158.181 with login) by smtp103.prem.mail.ac4.yahoo.com with SMTP; 13 Sep 2009 20:02:00 -0700 PDT X-Yahoo-SMTP: MLUTDXCswBBmC6xvZOGw0G_cPpRR X-YMail-OSG: 5A4EoXsVM1l5JWcRegYn8lRrMfTMdHkx90vuwFEAZ6iipFD9h5TqFFWR9ZmbuGofWWosbs.LnY_4RvlewnW2AEsSat6hLd7QCP4pf.1vJ0dfIsCp7L6QF0gnwuPSB4HLqjyi3tY4.I9HVyrdUmyVOnikE7p0R4lwN8cVm2jTJImoXdDymDH2PM8shMsG8Z1r0zMjikpZFkvxgXDtrroeMLPd4IiHfSGzMHcLvSzbrqVvvhKjRQZm1LS3bwXw9nUYev5F8yC0i0_gXzfxlDH2b2qtHrDkesFy37tYhFUECDl1PuylLJKOQuECjDqtrhu4gscX2HwqTYw- X-Yahoo-Newman-Property: ymail-3 Date: Mon, 14 Sep 2009 00:01:58 -0300 From: Rafael Ignacio Zurita To: linux-sh@vger.kernel.org Cc: lethal@linux-sh.org Subject: [PATCH] sh: remove set_bus_parent() from clock-sh7709.c file Message-ID: <20090914030158.GA22263@rafazurita.homelinux.net> Reply-To: Rafael Ignacio Zurita MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org It prevents the change of the parent of sh7709_cpu_clk and sh7709_module_clk (which does not work with that set_bus_parent() in the current scheme). Signed-off-by: Rafael Ignacio Zurita --- arch/sh/kernel/cpu/sh3/clock-sh7709.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7709.c b/arch/sh/kernel/cpu/sh3/clock-sh7709.c index fa30b60..e874950 100644 --- a/arch/sh/kernel/cpu/sh3/clock-sh7709.c +++ b/arch/sh/kernel/cpu/sh3/clock-sh7709.c @@ -22,13 +22,6 @@ static int stc_multipliers[] = { 1, 2, 4, 8, 3, 6, 1, 1 }; static int ifc_divisors[] = { 1, 2, 4, 1, 3, 1, 1, 1 }; static int pfc_divisors[] = { 1, 2, 4, 1, 3, 6, 1, 1 }; -static void set_bus_parent(struct clk *clk) -{ - struct clk *bus_clk = clk_get(NULL, "bus_clk"); - clk->parent = bus_clk; - clk_put(bus_clk); -} - static void master_clk_init(struct clk *clk) { int frqcr = ctrl_inw(FRQCR); @@ -50,9 +43,6 @@ static unsigned long module_clk_recalc(struct clk *clk) } static struct clk_ops sh7709_module_clk_ops = { -#ifdef CLOCK_MODE_0_1_2_7 - .init = set_bus_parent, -#endif .recalc = module_clk_recalc, }; @@ -78,7 +68,6 @@ static unsigned long cpu_clk_recalc(struct clk *clk) } static struct clk_ops sh7709_cpu_clk_ops = { - .init = set_bus_parent, .recalc = cpu_clk_recalc, };