Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] clocksource: small cleanup

Browse source 
Mostly changing alignment.  Just some general cleanup.

[akpm@osdl.org: build fix]
Signed-off-by: Daniel Walker <dwalker@mvista.com>
Acked-by: John Stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Daniel Walker 2006-12-10 02:21:33 -08:00 committed by Linus Torvalds
parent 2b0137001d
commit f5f1a24a2c
4 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/clocksource/acpi_pm.c
View file

@ -77,11 +77,11 @@ static struct clocksource clocksource_acpi_pm = {
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static int acpi_pm_good; static int __devinitdata acpi_pm_good;
static int __init acpi_pm_good_setup(char *__str) static int __init acpi_pm_good_setup(char *__str)
{ {
acpi_pm_good = 1; acpi_pm_good = 1;
return 1; return 1;
} }
__setup("acpi_pm_good", acpi_pm_good_setup); __setup("acpi_pm_good", acpi_pm_good_setup);

2
include/linux/clocksource.h
View file

@ -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! * Unless you're the timekeeping code, you should not be using this!
*/ */
static inline void clocksource_calculate_interval(struct clocksource *c, static inline void clocksource_calculate_interval(struct clocksource *c,
unsigned long length_nsec) unsigned long length_nsec)
{ {
u64 tmp; u64 tmp;

6
kernel/time/clocksource.c
View file

@ -156,7 +156,7 @@ int clocksource_register(struct clocksource *c)
/* check if clocksource is already registered */ /* check if clocksource is already registered */
if (is_registered_source(c)) { if (is_registered_source(c)) {
printk("register_clocksource: Cannot register %s. " printk("register_clocksource: Cannot register %s. "
"Already registered!", c->name); "Already registered!", c->name);
ret = -EBUSY; ret = -EBUSY;
} else { } else {
/* register it */ /* register it */
@ -276,10 +276,10 @@ sysfs_show_available_clocksources(struct sys_device *dev, char *buf)
* Sysfs setup bits: * Sysfs setup bits:
*/ */
static SYSDEV_ATTR(current_clocksource, 0600, sysfs_show_current_clocksources, static SYSDEV_ATTR(current_clocksource, 0600, sysfs_show_current_clocksources,
sysfs_override_clocksource); sysfs_override_clocksource);
static SYSDEV_ATTR(available_clocksource, 0600, static SYSDEV_ATTR(available_clocksource, 0600,
sysfs_show_available_clocksources, NULL); sysfs_show_available_clocksources, NULL);
static struct sysdev_class clocksource_sysclass = { static struct sysdev_class clocksource_sysclass = {
set_kset_name("clocksource"), set_kset_name("clocksource"),

16
kernel/timer.c
View file

@ -846,7 +846,7 @@ static int change_clocksource(void)
clock = new; clock = new;
clock->cycle_last = now; clock->cycle_last = now;
printk(KERN_INFO "Time: %s clocksource has been installed.\n", printk(KERN_INFO "Time: %s clocksource has been installed.\n",
clock->name); clock->name);
return 1; return 1;
} else if (clock->update_callback) { } else if (clock->update_callback) {
return clock->update_callback(); return clock->update_callback();
@ -854,7 +854,10 @@ static int change_clocksource(void)
return 0; return 0;
} }
#else #else
#define change_clocksource() (0) static inline int change_clocksource(void)
{
return 0;
}
#endif #endif
/** /**
@ -952,7 +955,8 @@ device_initcall(timekeeping_init_device);
* If the error is already larger, we look ahead even further * If the error is already larger, we look ahead even further
* to compensate for late or lost adjustments. * 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; s64 tick_error, i;
u32 look_ahead, adj; 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 * Now calculate the error in (1 << look_ahead) ticks, but first
* remove the single look ahead already included in the error. * 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; tick_error -= clock->xtime_interval >> 1;
error = ((error - tick_error) >> look_ahead) + tick_error; 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->mult += adj;
clock->xtime_interval += interval; clock->xtime_interval += interval;
clock->xtime_nsec -= offset; clock->xtime_nsec -= offset;
clock->error -= (interval - offset) << (TICK_LENGTH_SHIFT - clock->shift); clock->error -= (interval - offset) <<
(TICK_LENGTH_SHIFT - clock->shift);
} }
/** /**