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

[linux.git] / drivers / clocksource / timer-marco.c

diff --git a/drivers/clocksource/timer-marco.c b/drivers/clocksource/timer-marco.c
index 01b9683557b2e92f1e11e183eeb736517126efa3..09a17d9a6594c80e38c64bd18d6827db427df18b 100644 (file)
--- a/drivers/clocksource/timer-marco.c
+++ b/drivers/clocksource/timer-marco.c
@@ -175,7 +175,7 @@ static struct irqaction sirfsoc_timer1_irq = {
        .handler = sirfsoc_timer_interrupt,
 };
 
-static int __cpuinit sirfsoc_local_timer_setup(struct clock_event_device *ce)
+static int sirfsoc_local_timer_setup(struct clock_event_device *ce)
 {
        int cpu = smp_processor_id();
        struct irqaction *action;
@@ -204,7 +204,7 @@ static int __cpuinit sirfsoc_local_timer_setup(struct clock_event_device *ce)
        return 0;
 }
 
-static void __cpuinit sirfsoc_local_timer_stop(struct clock_event_device *ce)
+static void sirfsoc_local_timer_stop(struct clock_event_device *ce)
 {
        int cpu = smp_processor_id();
 
@@ -216,8 +216,8 @@ static void __cpuinit sirfsoc_local_timer_stop(struct clock_event_device *ce)
                remove_irq(sirfsoc_timer1_irq.irq, &sirfsoc_timer1_irq);
 }
 
-static int __cpuinit sirfsoc_cpu_notify(struct notifier_block *self,
-                                          unsigned long action, void *hcpu)
+static int sirfsoc_cpu_notify(struct notifier_block *self,
+                             unsigned long action, void *hcpu)
 {
        /*
         * Grab cpu pointer in each case to avoid spurious
@@ -235,7 +235,7 @@ static int __cpuinit sirfsoc_cpu_notify(struct notifier_block *self,
        return NOTIFY_OK;
 }
 
-static struct notifier_block sirfsoc_cpu_nb __cpuinitdata = {
+static struct notifier_block sirfsoc_cpu_nb = {
        .notifier_call = sirfsoc_cpu_notify,
 };