Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5f1a24a authored by Daniel Walker's avatar Daniel Walker Committed by Linus Torvalds
Browse files

[PATCH] clocksource: small cleanup 



Mostly changing alignment.  Just some general cleanup.

[akpm@osdl.org: build fix]
Signed-off-by: default avatarDaniel Walker <dwalker@mvista.com>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2b013700

drivers/clocksource/acpi_pm.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ 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;

kernel/timer.c

+11 −5
Original line number Original line Diff line number Diff line
@@ -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);

}

}





/**

/**

include/linux/clocksource.h

+1 −1

File changed.

Contains only whitespace changes.

kernel/time/clocksource.c

+3 −3

File changed.

Contains only whitespace changes.