Merge tag 'remove-local-timers' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / clocksource / exynos_mct.c

diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c
index 1c3f5a652044192b8d38da2ac76286751990e8f9..5b34768f4d7c79f68253966acc8e8268e53f318e 100644 (file)
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
@@ -398,19 +398,7 @@ static irqreturn_t exynos4_mct_tick_isr(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static struct irqaction mct_tick0_event_irq = {
-       .name           = "mct_tick0_irq",
-       .flags          = IRQF_TIMER | IRQF_NOBALANCING,
-       .handler        = exynos4_mct_tick_isr,
-};
-
-static struct irqaction mct_tick1_event_irq = {
-       .name           = "mct_tick1_irq",
-       .flags          = IRQF_TIMER | IRQF_NOBALANCING,
-       .handler        = exynos4_mct_tick_isr,
-};
-
-static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt)
+static int exynos4_local_timer_setup(struct clock_event_device *evt)
 {
        struct mct_clock_event_device *mevt;
        unsigned int cpu = smp_processor_id();
@@ -432,16 +420,15 @@ static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt)
        exynos4_mct_write(TICK_BASE_CNT, mevt->base + MCT_L_TCNTB_OFFSET);
 
        if (mct_int_type == MCT_INT_SPI) {
-               if (cpu == 0) {
-                       mct_tick0_event_irq.dev_id = mevt;
-                       evt->irq = mct_irqs[MCT_L0_IRQ];
-                       setup_irq(evt->irq, &mct_tick0_event_irq);
-               } else {
-                       mct_tick1_event_irq.dev_id = mevt;
-                       evt->irq = mct_irqs[MCT_L1_IRQ];
-                       setup_irq(evt->irq, &mct_tick1_event_irq);
-                       irq_set_affinity(evt->irq, cpumask_of(1));
+               evt->irq = mct_irqs[MCT_L0_IRQ + cpu];
+               if (request_irq(evt->irq, exynos4_mct_tick_isr,
+                               IRQF_TIMER | IRQF_NOBALANCING,
+                               evt->name, mevt)) {
+                       pr_err("exynos-mct: cannot register IRQ %d\n",
+                               evt->irq);
+                       return -EIO;
                }
+               irq_set_affinity(evt->irq, cpumask_of(cpu));
        } else {
                enable_percpu_irq(mct_irqs[MCT_L0_IRQ], 0);
        }
@@ -449,20 +436,16 @@ static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt)
        return 0;
 }
 
-static void __cpuinit exynos4_local_timer_stop(struct clock_event_device *evt)
+static void exynos4_local_timer_stop(struct clock_event_device *evt)
 {
-       unsigned int cpu = smp_processor_id();
        evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
        if (mct_int_type == MCT_INT_SPI)
-               if (cpu == 0)
-                       remove_irq(evt->irq, &mct_tick0_event_irq);
-               else
-                       remove_irq(evt->irq, &mct_tick1_event_irq);
+               free_irq(evt->irq, this_cpu_ptr(&percpu_mct_tick));
        else
                disable_percpu_irq(mct_irqs[MCT_L0_IRQ]);
 }
 
-static int __cpuinit exynos4_mct_cpu_notify(struct notifier_block *self,
+static int exynos4_mct_cpu_notify(struct notifier_block *self,
                                           unsigned long action, void *hcpu)
 {
        struct mct_clock_event_device *mevt;
@@ -485,7 +468,7 @@ static int __cpuinit exynos4_mct_cpu_notify(struct notifier_block *self,
        return NOTIFY_OK;
 }
 
-static struct notifier_block exynos4_mct_cpu_nb __cpuinitdata = {
+static struct notifier_block exynos4_mct_cpu_nb = {
        .notifier_call = exynos4_mct_cpu_notify,
 };