From patchwork Thu Feb 13 03:08:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tarek Dakhran X-Patchwork-Id: 3642111 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B80E09F503 for ; Thu, 13 Feb 2014 03:12:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E13A520154 for ; Thu, 13 Feb 2014 03:12:56 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED51820149 for ; Thu, 13 Feb 2014 03:12:55 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDmiq-0002UV-W5; Thu, 13 Feb 2014 03:12:21 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDmij-000199-3j; Thu, 13 Feb 2014 03:12:13 +0000 Received: from mailout3.w1.samsung.com ([210.118.77.13]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WDmiT-00016T-W3 for linux-arm-kernel@lists.infradead.org; Thu, 13 Feb 2014 03:11:59 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N0W00KTMZJ7J6A0@mailout3.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 13 Feb 2014 03:11:31 +0000 (GMT) X-AuditID: cbfec7f5-b7fc96d000004885-a1-52fc37e286d7 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 30.08.18565.2E73CF25; Thu, 13 Feb 2014 03:11:30 +0000 (GMT) Received: from localhost.localdomain ([168.219.243.98]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N0W0018KZIRMJ60@eusync3.samsung.com>; Thu, 13 Feb 2014 03:11:30 +0000 (GMT) From: Tarek Dakhran To: linux-kernel@vger.kernel.org Subject: [PATCH v1 2/2] clocksource: mct: cleanup, remove non-dt stuff from mct Date: Thu, 13 Feb 2014 12:08:43 +0900 Message-id: <1392260923-31659-3-git-send-email-t.dakhran@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1392260923-31659-1-git-send-email-t.dakhran@samsung.com> References: <1392260923-31659-1-git-send-email-t.dakhran@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprKLMWRmVeSWpSXmKPExsVy+t/xq7qPzP8EGfx9Y2Ix77OsRe+Cq2wW mx5fY7W4vGsOm8WM8/uYLG5f5rU4+aeX0eJ3zydmi/XPTzFarJ/xmsVi86apzBZTZ/xgd+Dx aGnuYfPYOesuu8eda3vYPN6dO8fusXlJvUffllWMHp83yQWwR3HZpKTmZJalFunbJXBlXPn4 g63gBV/Fka4+5gbGjTxdjJwcEgImEncndTJB2GISF+6tZ+ti5OIQEljKKDH3dRsjhNPLJDGv dwZQhoODTUBbYssOL5AGEQEFic29z1hBapgFNjFLXF7wiQmkRljAX2LvZ1WQGhYBVYkH37eB LeAVcJV4f2c6M8QyRYnuZxPYQGxOATeJnqvNYHEhoJpvi6+zTWDkXcDIsIpRNLU0uaA4KT3X SK84Mbe4NC9dLzk/dxMjJCi/7mBceszqEKMAB6MSD++Dxb+DhFgTy4orcw8xSnAwK4nwykj8 CRLiTUmsrEotyo8vKs1JLT7EyMTBKdXAqDtpbumuWZr/oozvhe1wN5F5mPRsBfOiULv3x0Wd eeS3apz0ZqhdH7O1Ke1X18f1H5MFf737mKsfZrs2521ZieGaB+9ntFteEmhhnHD3UWhC93lZ mc/MC5d47qxaxul64+hiS5/O2VPXlfMnTQmxPHNT7eI27T8pO/9Hfzl26nfj/RPTCxqfdiix FGckGmoxFxUnAgAHKID0KAIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140212_221158_120205_57A6E993 X-CRM114-Status: UNSURE ( 9.46 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.5 (----) Cc: Tarek Dakhran , Kukjin Kim , Russell King , Tarek Dakhran , Sachin Kamat , Tomasz Figa , Daniel Lezcano , linux-samsung-soc@vger.kernel.org, Vyacheslav Tyrtov , Thomas Gleixner , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP mct_init not used anywhere, remove this non-dt stuff. also remove declaration of mct_init in arch/arm/mach-exynos/common.h Signed-off-by: Tarek Dakhran --- arch/arm/mach-exynos/common.h | 2 -- drivers/clocksource/exynos_mct.c | 17 +---------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index f76967b..8945170 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -15,8 +15,6 @@ #include #include -void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1); - struct map_desc; void exynos_init_io(void); void exynos4_restart(enum reboot_mode mode, const char *cmd); diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c index 1cde3de..a94a908 100644 --- a/drivers/clocksource/exynos_mct.c +++ b/drivers/clocksource/exynos_mct.c @@ -548,18 +548,6 @@ out_irq: free_percpu_irq(mct_irqs[MCT_L0_IRQ], &percpu_mct_tick); } -void __init mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1) -{ - mct_irqs[MCT_G0_IRQ] = irq_g0; - mct_irqs[MCT_L0_IRQ] = irq_l0; - mct_irqs[MCT_L1_IRQ] = irq_l1; - mct_int_type = MCT_INT_SPI; - - exynos4_timer_resources(NULL, base); - exynos4_clocksource_init(); - exynos4_clockevent_init(); -} - static void __init mct_init_dt(struct device_node *np, unsigned int int_type) { u32 nr_irqs, i; @@ -574,11 +562,8 @@ static void __init mct_init_dt(struct device_node *np, unsigned int int_type) * timer irqs are specified after the four global timer * irqs are specified. */ -#ifdef CONFIG_OF nr_irqs = of_irq_count(np); -#else - nr_irqs = 0; -#endif + for (i = MCT_L0_IRQ; i < nr_irqs; i++) mct_irqs[i] = irq_of_parse_and_map(np, i);