From patchwork Mon Sep 14 00:48:51 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: 47210 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 n8E0mwgM012076 for ; Mon, 14 Sep 2009 00:48:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754603AbZINAsx (ORCPT ); Sun, 13 Sep 2009 20:48:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754620AbZINAsx (ORCPT ); Sun, 13 Sep 2009 20:48:53 -0400 Received: from smtp101.prem.mail.ac4.yahoo.com ([76.13.13.40]:48487 "HELO smtp101.prem.mail.ac4.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754603AbZINAsx (ORCPT ); Sun, 13 Sep 2009 20:48:53 -0400 Received: (qmail 84690 invoked from network); 14 Sep 2009 00:48:56 -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=itXk+GRSiJuClQUhEYSd+p4AF0ygQGywzTFzkvaTUS49JtIpeIEBQP/Bym36vsfgQ1J7fAyQ5qlD780x6WUeP4tNhUCek8i9thUfYb5TI865297ZjDRobfrO3nUoInSZhoQe3U/CdqnfNbbQ8/umpwPC2CXQ9UgM1JC+gwBCui4= ; Received: from customer-static-123-158-181.iplannetworks.net (rizurita@200.123.158.181 with login) by smtp101.prem.mail.ac4.yahoo.com with SMTP; 13 Sep 2009 17:48:55 -0700 PDT X-Yahoo-SMTP: MLUTDXCswBBmC6xvZOGw0G_cPpRR X-YMail-OSG: 6gUIBNAVM1lEX5h5TkYaz_coDwNTAWVcKM3jrG81itqQBJBqdMAoXJ3skaCMeFPLruqpfcVHUClWkBIw.k69vUPYiE0H6wP5b787hx_niJ1OKd1ihqgg2GtRsZ_P41Dj1TcJCS.ersAqButxZt8i.QhIbU.GZgiHmjuKtkeaRd0DrHDoyRZNWfbagKeNJ8JDCPvyHPsr9FaLN20BqaLBM9kpXXh4pwg6_EFXljMYzLC3M0tZ39TGi4yIfGwBwJOMuYdpgib9YlF.s6DDUkNNePggIiEgg2j.3gv1ZgXxCHxpakIT6yT8z3njLAhhYQmhbfYLdyWIaifuMmRceizmCE4Nar6yPSVYbbmZ8Zc- X-Yahoo-Newman-Property: ymail-3 Date: Sun, 13 Sep 2009 21:48:51 -0300 From: Rafael Ignacio Zurita To: linux-sh@vger.kernel.org Cc: lethal@linux-sh.org Subject: [PATCH] sh: remove .init from sh7709_cpu_clk_ops Message-ID: <20090914004851.GA14697@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 avoids to change the parent of sh7709_cpu_clk. With this change master_clk is the parent of cpu_clk (from clk_cpg_legacy), and it prevents the second mutex_lock(&clock_list_sem) while the first one is still locked. Signed-off-by: Rafael Ignacio Zurita --- arch/sh/kernel/cpu/sh3/clock-sh7709.c | 1 - 1 files changed, 0 insertions(+), 1 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..f3064f9 100644 --- a/arch/sh/kernel/cpu/sh3/clock-sh7709.c +++ b/arch/sh/kernel/cpu/sh3/clock-sh7709.c @@ -78,7 +78,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, };