Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clocke...

[deliverable/linux.git] / drivers / clocksource / arm_arch_timer.c

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index b3df46d9918b5b45de6c96b22073aeb1105bc67c..fbd9ccd5e114ccdf1eb2db91499315689f6ed407 100644 (file)
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -72,7 +72,7 @@ static bool arch_timer_mem_use_virtual;
 
 static __always_inline
 void arch_timer_reg_write(int access, enum arch_timer_reg reg, u32 val,
-               struct clock_event_device *clk)
+                         struct clock_event_device *clk)
 {
        if (access == ARCH_TIMER_MEM_PHYS_ACCESS) {
                struct arch_timer *timer = to_arch_timer(clk);
@@ -101,7 +101,7 @@ void arch_timer_reg_write(int access, enum arch_timer_reg reg, u32 val,
 
 static __always_inline
 u32 arch_timer_reg_read(int access, enum arch_timer_reg reg,
-               struct clock_event_device *clk)
+                       struct clock_event_device *clk)
 {
        u32 val;
 
@@ -136,6 +136,7 @@ static __always_inline irqreturn_t timer_handler(const int access,
                                        struct clock_event_device *evt)
 {
        unsigned long ctrl;
+
        ctrl = arch_timer_reg_read(access, ARCH_TIMER_REG_CTRL, evt);
        if (ctrl & ARCH_TIMER_CTRL_IT_STAT) {
                ctrl |= ARCH_TIMER_CTRL_IT_MASK;
@@ -216,7 +217,7 @@ static void arch_timer_set_mode_phys_mem(enum clock_event_mode mode,
 }
 
 static __always_inline void set_next_event(const int access, unsigned long evt,
-                                 struct clock_event_device *clk)
+                                          struct clock_event_device *clk)
 {
        unsigned long ctrl;
        ctrl = arch_timer_reg_read(access, ARCH_TIMER_REG_CTRL, clk);
@@ -254,8 +255,8 @@ static int arch_timer_set_next_event_phys_mem(unsigned long evt,
        return 0;
 }
 
-static void __cpuinit __arch_timer_setup(unsigned type,
-                                      struct clock_event_device *clk)
+static void __arch_timer_setup(unsigned type,
+                              struct clock_event_device *clk)
 {
        clk->features = CLOCK_EVT_FEAT_ONESHOT;
 
@@ -293,7 +294,7 @@ static void __cpuinit __arch_timer_setup(unsigned type,
        clockevents_config_and_register(clk, arch_timer_rate, 0xf, 0x7fffffff);
 }
 
-static int __cpuinit arch_timer_setup(struct clock_event_device *clk)
+static int arch_timer_setup(struct clock_event_device *clk)
 {
        __arch_timer_setup(ARCH_CP15_TIMER, clk);
 
@@ -420,7 +421,7 @@ static void __init arch_counter_register(unsigned type)
        timecounter_init(&timecounter, &cyclecounter, start_count);
 }
 
-static void __cpuinit arch_timer_stop(struct clock_event_device *clk)
+static void arch_timer_stop(struct clock_event_device *clk)
 {
        pr_debug("arch_timer_teardown disable IRQ%d cpu #%d\n",
                 clk->irq, smp_processor_id());
@@ -436,7 +437,7 @@ static void __cpuinit arch_timer_stop(struct clock_event_device *clk)
        clk->set_mode(CLOCK_EVT_MODE_UNUSED, clk);
 }
 
-static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
+static int arch_timer_cpu_notify(struct notifier_block *self,
                                           unsigned long action, void *hcpu)
 {
        /*
@@ -455,7 +456,7 @@ static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
        return NOTIFY_OK;
 }
 
-static struct notifier_block arch_timer_cpu_nb __cpuinitdata = {
+static struct notifier_block arch_timer_cpu_nb = {
        .notifier_call = arch_timer_cpu_notify,
 };
 
@@ -671,7 +672,7 @@ static void __init arch_timer_mem_init(struct device_node *np)
        of_node_put(best_frame);
        if (!irq) {
                pr_err("arch_timer: Frame missing %s irq",
-                               arch_timer_mem_use_virtual ? "virt" : "phys");
+                      arch_timer_mem_use_virtual ? "virt" : "phys");
                return;
        }