From: Tarek Dakhran <t.dakhran@samsung.com> To: linux-kernel@vger.kernel.org Cc: Russell King <linux@arm.linux.org.uk>, Kukjin Kim <kgene.kim@samsung.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, Sachin Kamat <sachin.kamat@linaro.org>, Thomas Gleixner <tglx@linutronix.de>, Tarek Dakhran <t.dakhran@gmail.com>, Vyacheslav Tyrtov <v.tyrtov@samsung.com>, Tomasz Figa <t.figa@samsung.com>, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, Tarek Dakhran <t.dakhran@samsung.com> Subject: [PATCH v1 2/2] clocksource: mct: cleanup, remove non-dt stuff from mct Date: Thu, 13 Feb 2014 12:08:43 +0900 [thread overview] Message-ID: <1392260923-31659-3-git-send-email-t.dakhran@samsung.com> (raw) In-Reply-To: <1392260923-31659-1-git-send-email-t.dakhran@samsung.com> 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 <t.dakhran@samsung.com> --- 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 <linux/reboot.h> #include <linux/of.h> -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); -- 1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: t.dakhran@samsung.com (Tarek Dakhran) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v1 2/2] clocksource: mct: cleanup, remove non-dt stuff from mct Date: Thu, 13 Feb 2014 12:08:43 +0900 [thread overview] Message-ID: <1392260923-31659-3-git-send-email-t.dakhran@samsung.com> (raw) In-Reply-To: <1392260923-31659-1-git-send-email-t.dakhran@samsung.com> 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 <t.dakhran@samsung.com> --- 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 <linux/reboot.h> #include <linux/of.h> -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); -- 1.7.10.4
next prev parent reply other threads:[~2014-02-13 3:11 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-02-13 3:08 [PATCH v1 0/2] exynos_mct driver: fix irq allocation and cleanup Tarek Dakhran 2014-02-13 3:08 ` Tarek Dakhran 2014-02-13 3:08 ` [PATCH v1 1/2] clocksource: mct: remove request_irq from exynos4_local_timer_setup Tarek Dakhran 2014-02-13 3:08 ` Tarek Dakhran 2014-02-15 12:42 ` Thomas Gleixner 2014-02-15 12:42 ` Thomas Gleixner 2014-02-13 3:08 ` Tarek Dakhran [this message] 2014-02-13 3:08 ` [PATCH v1 2/2] clocksource: mct: cleanup, remove non-dt stuff from mct Tarek Dakhran 2014-02-13 12:36 ` [PATCH v1 0/2] exynos_mct driver: fix irq allocation and cleanup Tomasz Figa 2014-02-13 12:36 ` Tomasz Figa [not found] ` <CANhyOUcBrsnfSa3sCGbFqUB0g6zfG9moqbGapJGU3zbxWQVgiA@mail.gmail.com> 2014-02-15 4:12 ` Tarek Dakhran 2014-02-15 4:12 ` Tarek Dakhran 2014-02-15 4:12 ` Tarek Dakhran
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1392260923-31659-3-git-send-email-t.dakhran@samsung.com \ --to=t.dakhran@samsung.com \ --cc=daniel.lezcano@linaro.org \ --cc=kgene.kim@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=sachin.kamat@linaro.org \ --cc=t.dakhran@gmail.com \ --cc=t.figa@samsung.com \ --cc=tglx@linutronix.de \ --cc=v.tyrtov@samsung.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.