From patchwork Sat Apr 28 16:02:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 155670 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D2F76B6FD8 for ; Sun, 29 Apr 2012 02:07:01 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SOA8q-0000XM-9s; Sat, 28 Apr 2012 16:05:00 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SOA83-0008Ty-MN for linux-arm-kernel@lists.infradead.org; Sat, 28 Apr 2012 16:04:12 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq13so2309375pbb.36 for ; Sat, 28 Apr 2012 09:04:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=GOWOf9TiG0aFdvaq1Z9gi21hLtn4N48m+RzJTYK5dAA=; b=au3QdtPiPdtDxY1BI33aJhK3aDjUMqCqqQpRFftBCEncnhTMTLPiKmjZ3vCXsCKbwm xePamuVf8LZTaqQSBS15G/f7SpW9OaQTF2PTcC/GXlHGEynYKjFiYyanR528DfwS7TJO RJbO43Ci4ZfW900cBe248dB1vn+ab9ikmLDcP7PK+yLW+y0+jIU4XY/L7vZjc4Hh4mkM 7eoy7icCu+7+8sH1QLlPAV+lvunW833hd0RfKNDRmaocwaiDe2iyCuolcsgCbHoe2Kw3 tiZ6udsZdIM7QdDvNUZUhyEtdAikXbRkm/8jHi5gHkynajAw0yDvh/TKltMmjZUx9VfZ DH3g== Received: by 10.68.202.167 with SMTP id kj7mr33383933pbc.9.1335629051432; Sat, 28 Apr 2012 09:04:11 -0700 (PDT) Received: from localhost.localdomain ([221.225.141.125]) by mx.google.com with ESMTPS id wf6sm10058927pbc.8.2012.04.28.09.04.05 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 28 Apr 2012 09:04:10 -0700 (PDT) From: Shawn Guo To: Arnd Bergmann , Olof Johansson Subject: [PATCH v2 8/8] ARM: mxs: remove now unused timer_clk argument from mxs_timer_init Date: Sun, 29 Apr 2012 00:02:41 +0800 Message-Id: <1335628961-1340-9-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1335628961-1340-1-git-send-email-shawn.guo@linaro.org> References: <1335628961-1340-1-git-send-email-shawn.guo@linaro.org> X-Gm-Message-State: ALoCoQlw8LP/Q5NyW1mDAY3E9C9DumQGmtcSDSKp0OMvH/lhSVoDLA3g29X8p0Zi1mx4gd6Xoo4f X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Sascha Hauer , Shawn Guo , Mike Turquette , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org With old mxs clock support removed, the timer_clk argument of mxs_timer_init is unused now, so remove it. Signed-off-by: Shawn Guo --- arch/arm/mach-mxs/include/mach/common.h | 4 +--- arch/arm/mach-mxs/timer.c | 14 +++++++------- drivers/clk/mxs/clk-imx23.c | 2 +- drivers/clk/mxs/clk-imx28.c | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h index e1237ab..9bdc953 100644 --- a/arch/arm/mach-mxs/include/mach/common.h +++ b/arch/arm/mach-mxs/include/mach/common.h @@ -11,11 +11,9 @@ #ifndef __MACH_MXS_COMMON_H__ #define __MACH_MXS_COMMON_H__ -struct clk; - extern const u32 *mxs_get_ocotp(void); extern int mxs_reset_block(void __iomem *); -extern void mxs_timer_init(struct clk *, int); +extern void mxs_timer_init(int); extern void mxs_restart(char, const char *); extern int mxs_saif_clkmux_select(unsigned int clkmux); diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c index 575e8fd..02d36de 100644 --- a/arch/arm/mach-mxs/timer.c +++ b/arch/arm/mach-mxs/timer.c @@ -244,14 +244,14 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) return 0; } -void __init mxs_timer_init(struct clk *timer_clk, int irq) +void __init mxs_timer_init(int irq) { - if (!timer_clk) { - timer_clk = clk_get_sys("timrot", NULL); - if (IS_ERR(timer_clk)) { - pr_err("%s: failed to get clk\n", __func__); - return; - } + struct clk *timer_clk; + + timer_clk = clk_get_sys("timrot", NULL); + if (IS_ERR(timer_clk)) { + pr_err("%s: failed to get clk\n", __func__); + return; } clk_prepare_enable(timer_clk); diff --git a/drivers/clk/mxs/clk-imx23.c b/drivers/clk/mxs/clk-imx23.c index 2ec76ff..dcae112 100644 --- a/drivers/clk/mxs/clk-imx23.c +++ b/drivers/clk/mxs/clk-imx23.c @@ -198,7 +198,7 @@ int __init mx23_clocks_init(void) for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) clk_prepare_enable(clks[clks_init_on[i]]); - mxs_timer_init(NULL, MX23_INT_TIMER0); + mxs_timer_init(MX23_INT_TIMER0); return 0; } diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c index 7617894..2ae0d3d 100644 --- a/drivers/clk/mxs/clk-imx28.c +++ b/drivers/clk/mxs/clk-imx28.c @@ -322,7 +322,7 @@ int __init mx28_clocks_init(void) for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) clk_prepare_enable(clks[clks_init_on[i]]); - mxs_timer_init(NULL, MX28_INT_TIMER0); + mxs_timer_init(MX28_INT_TIMER0); return 0; }