diff options
author | Matthias Kaehlcke <matthias.kaehlcke@gmail.com> | 2007-10-19 02:39:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:53:38 -0400 |
commit | 2e1975868ac9d41211fcaa6f2c5e44c4e7ff9e5b (patch) | |
tree | fdf1304a9bcd092c63df6423327f33fcf5c3d44b | |
parent | 03ff17979c58a0b63b0fe30a373f41b719731bd2 (diff) |
kernel/time/clocksource.c: Use list_for_each_entry instead of list_for_each
kernel/time/clocksource.c: Convert list_for_each to
list_for_each_entry in clocksource_resume(),
sysfs_override_clocksource() and show_available_clocksources()
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | kernel/time/clocksource.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 51b6a6a6158c..c8a9d13874df 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
@@ -207,15 +207,12 @@ static inline void clocksource_resume_watchdog(void) { } | |||
207 | */ | 207 | */ |
208 | void clocksource_resume(void) | 208 | void clocksource_resume(void) |
209 | { | 209 | { |
210 | struct list_head *tmp; | 210 | struct clocksource *cs; |
211 | unsigned long flags; | 211 | unsigned long flags; |
212 | 212 | ||
213 | spin_lock_irqsave(&clocksource_lock, flags); | 213 | spin_lock_irqsave(&clocksource_lock, flags); |
214 | 214 | ||
215 | list_for_each(tmp, &clocksource_list) { | 215 | list_for_each_entry(cs, &clocksource_list, list) { |
216 | struct clocksource *cs; | ||
217 | |||
218 | cs = list_entry(tmp, struct clocksource, list); | ||
219 | if (cs->resume) | 216 | if (cs->resume) |
220 | cs->resume(); | 217 | cs->resume(); |
221 | } | 218 | } |
@@ -369,7 +366,6 @@ static ssize_t sysfs_override_clocksource(struct sys_device *dev, | |||
369 | const char *buf, size_t count) | 366 | const char *buf, size_t count) |
370 | { | 367 | { |
371 | struct clocksource *ovr = NULL; | 368 | struct clocksource *ovr = NULL; |
372 | struct list_head *tmp; | ||
373 | size_t ret = count; | 369 | size_t ret = count; |
374 | int len; | 370 | int len; |
375 | 371 | ||
@@ -389,12 +385,11 @@ static ssize_t sysfs_override_clocksource(struct sys_device *dev, | |||
389 | 385 | ||
390 | len = strlen(override_name); | 386 | len = strlen(override_name); |
391 | if (len) { | 387 | if (len) { |
388 | struct clocksource *cs; | ||
389 | |||
392 | ovr = clocksource_override; | 390 | ovr = clocksource_override; |
393 | /* try to select it: */ | 391 | /* try to select it: */ |
394 | list_for_each(tmp, &clocksource_list) { | 392 | list_for_each_entry(cs, &clocksource_list, list) { |
395 | struct clocksource *cs; | ||
396 | |||
397 | cs = list_entry(tmp, struct clocksource, list); | ||
398 | if (strlen(cs->name) == len && | 393 | if (strlen(cs->name) == len && |
399 | !strcmp(cs->name, override_name)) | 394 | !strcmp(cs->name, override_name)) |
400 | ovr = cs; | 395 | ovr = cs; |
@@ -422,14 +417,11 @@ static ssize_t sysfs_override_clocksource(struct sys_device *dev, | |||
422 | static ssize_t | 417 | static ssize_t |
423 | sysfs_show_available_clocksources(struct sys_device *dev, char *buf) | 418 | sysfs_show_available_clocksources(struct sys_device *dev, char *buf) |
424 | { | 419 | { |
425 | struct list_head *tmp; | 420 | struct clocksource *src; |
426 | char *curr = buf; | 421 | char *curr = buf; |
427 | 422 | ||
428 | spin_lock_irq(&clocksource_lock); | 423 | spin_lock_irq(&clocksource_lock); |
429 | list_for_each(tmp, &clocksource_list) { | 424 | list_for_each_entry(src, &clocksource_list, list) { |
430 | struct clocksource *src; | ||
431 | |||
432 | src = list_entry(tmp, struct clocksource, list); | ||
433 | curr += sprintf(curr, "%s ", src->name); | 425 | curr += sprintf(curr, "%s ", src->name); |
434 | } | 426 | } |
435 | spin_unlock_irq(&clocksource_lock); | 427 | spin_unlock_irq(&clocksource_lock); |