clocksource: small cleanup
PATCH 1/1 clocksource: small cleanup
Mostly changing alignment. Just some general cleanup.
Signed-off-by Daniel Walker <[email protected]>
Acked-by John Stultz <[email protected]>
--- include/linux/clocksource.h | 2 +- kernel/time/clocksource.c | 6 +++--- kernel/timer.c | 13 ++++++++----- 3 files changed, 12 insertions(+), 9 deletions(-)
include/linux/clocksource.h +1 -1
@@ -159,7 +159,7 @@ static inline s64 cyc2ns(struct clocksou* 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;
kernel/time/clocksource.c +3 -3
@@ -156,7 +156,7 @@ int clocksource_register(struct clocksou/* 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 */
@@ -275,10 +275,10 @@ sysfs_show_available_clocksources(struct* 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" ),
kernel/timer.c +8 -5
@@ -786,7 +786,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 ();
@@ -794,7 +794,7 @@ static int change_clocksource(void) return 0; }#else -#define change_clocksource () (0) +#define change_clocksource () do { 0; } while(0)#endif /**
@@ -927,7 +927,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;
@@ -951,7 +952,8 @@ static __always_inline int clocksource_b* 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;
@@ -1003,7 +1005,8 @@ static void clocksource_adjust(struct cl 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); }/**
--