2006-10-06 18:57:30

by Daniel Walker

Subject: [PATCH 02/10] -mm: 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 | 7 ++++---
3 files changed, 8 insertions(+), 7 deletions(-)

Index: linux-2.6.18/include/linux/clocksource.h
===================================================================
--- linux-2.6.18.orig/include/linux/clocksource.h
+++ linux-2.6.18/include/linux/clocksource.h
@@ -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;

Index: linux-2.6.18/kernel/time/clocksource.c
===================================================================
--- linux-2.6.18.orig/kernel/time/clocksource.c
+++ linux-2.6.18/kernel/time/clocksource.c
@@ -143,7 +143,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 */
@@ -262,10 +262,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"),
Index: linux-2.6.18/kernel/timer.c
===================================================================
--- linux-2.6.18.orig/kernel/timer.c
+++ linux-2.6.18/kernel/timer.c
@@ -714,7 +714,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();
@@ -722,7 +722,7 @@ static int change_clocksource(void)
return 0;
}
#else
-#define change_clocksource() (0)
+#define change_clocksource() do { 0; } while(0)
#endif

/**
@@ -940,7 +940,8 @@ static void update_wall_time(void)

/* accumulate error between NTP and clock interval */
clock->error += current_tick_length();
- clock->error -= clock->xtime_interval << (TICK_LENGTH_SHIFT - clock->shift);
+ clock->error -= clock->xtime_interval <<
+ (TICK_LENGTH_SHIFT - clock->shift);
}

/* correct the clock when NTP error is too big */

--

2006-10-09 18:51:59

by john stultz

Subject: Re: [PATCH 02/10] -mm: clocksource: small cleanup

On Fri, 2006-10-06 at 11:54 -0700, Daniel Walker wrote:
> plain text document attachment (clocksource_cleanup.patch)
> Mostly changing alignment. Just some general cleanup.
>
> Signed-Off-By: Daniel Walker <[email protected]>
> Acked-by: John Stultz <[email protected]>

Just a re-ack. :) This all looks fine.

thanks
-john