4 files changed, 18 insertions, 12 deletions

diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index 8ab61ef97b4c..b6bcdbbf57b3 100644
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -77,11 +77,11 @@ static struct clocksource clocksource_acpi_pm = {
 
 
 #ifdef CONFIG_PCI
-static int acpi_pm_good;
+static int __devinitdata acpi_pm_good;
 static int __init acpi_pm_good_setup(char *__str)
 {
-       acpi_pm_good = 1;
-       return 1;
+        acpi_pm_good = 1;
+        return 1;
 }
 __setup("acpi_pm_good", acpi_pm_good_setup);
 
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index d852024ed095..1622d23a8dc3 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -159,7 +159,7 @@ static inline s64 cyc2ns(struct clocksource *cs, cycle_t cycles)
  * Unless you're the timekeeping code, you should not be using this!
  */
 static inline void clocksource_calculate_interval(struct clocksource *c,
-                                                unsigned long length_nsec)
+                                                  unsigned long length_nsec)
 {
         u64 tmp;
 
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 3651b34cc355..22504afc0d34 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -156,7 +156,7 @@ int clocksource_register(struct clocksource *c)
         /* check if clocksource is already registered */
         if (is_registered_source(c)) {
                 printk("register_clocksource: Cannot register %s. "
-                        "Already registered!", c->name);
+                       "Already registered!", c->name);
                 ret = -EBUSY;
         } else {
                 /* register it */
@@ -276,10 +276,10 @@ sysfs_show_available_clocksources(struct sys_device *dev, char *buf)
  * Sysfs setup bits:
  */
 static SYSDEV_ATTR(current_clocksource, 0600, sysfs_show_current_clocksources,
-                        sysfs_override_clocksource);
+                   sysfs_override_clocksource);
 
 static SYSDEV_ATTR(available_clocksource, 0600,
-                        sysfs_show_available_clocksources, NULL);
+                   sysfs_show_available_clocksources, NULL);
 
 static struct sysdev_class clocksource_sysclass = {
         set_kset_name("clocksource"),
diff --git a/kernel/timer.c b/kernel/timer.c
index b1f40f256eb0..0256ab443d8a 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -846,7 +846,7 @@ static int change_clocksource(void)
                 clock = new;
                 clock->cycle_last = now;
                 printk(KERN_INFO "Time: %s clocksource has been installed.\n",
-                                        clock->name);
+                       clock->name);
                 return 1;
         } else if (clock->update_callback) {
                 return clock->update_callback();
@@ -854,7 +854,10 @@ static int change_clocksource(void)
         return 0;
 }
 #else
-#define change_clocksource() (0)
+static inline int change_clocksource(void)
+{
+        return 0;
+}
 #endif
 
 /**
@@ -952,7 +955,8 @@ device_initcall(timekeeping_init_device);
  * If the error is already larger, we look ahead even further
  * to compensate for late or lost adjustments.
  */
-static __always_inline int clocksource_bigadjust(s64 error, s64 *interval, s64 *offset)
+static __always_inline int clocksource_bigadjust(s64 error, s64 *interval,
+                                                 s64 *offset)
 {
         s64 tick_error, i;
         u32 look_ahead, adj;
@@ -976,7 +980,8 @@ static __always_inline int clocksource_bigadjust(s64 error, s64 *interval, s64 *
          * Now calculate the error in (1 << look_ahead) ticks, but first
          * remove the single look ahead already included in the error.
          */
-        tick_error = current_tick_length() >> (TICK_LENGTH_SHIFT - clock->shift + 1);
+        tick_error = current_tick_length() >>
+                (TICK_LENGTH_SHIFT - clock->shift + 1);
         tick_error -= clock->xtime_interval >> 1;
         error = ((error - tick_error) >> look_ahead) + tick_error;
 
@@ -1028,7 +1033,8 @@ static void clocksource_adjust(struct clocksource *clock, s64 offset)
         clock->mult += adj;
         clock->xtime_interval += interval;
         clock->xtime_nsec -= offset;
-        clock->error -= (interval - offset) << (TICK_LENGTH_SHIFT - clock->shift);
+        clock->error -= (interval - offset) <<
+                        (TICK_LENGTH_SHIFT - clock->shift);
 }
 
 /**