aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2011-11-23 15:07:21 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-11-24 22:10:00 -0500
commit621692cb7efb6d0e38c62e41844a6360c6719b20 (patch)
tree03358fbf8017f3382d627d4cb29eefb9b2bde22c
parent68568add2ca70153cca3dd1858eaa0776821cf75 (diff)
powerpc/time: Fix some style issues
Fix some formatting issues and use the DECREMENTER_MAX define instead of 0x7fffffff. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/kernel/time.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 2eaaa242c2e..b1990b987e2 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -106,12 +106,12 @@ static void decrementer_set_mode(enum clock_event_mode mode,
106 struct clock_event_device *dev); 106 struct clock_event_device *dev);
107 107
108static struct clock_event_device decrementer_clockevent = { 108static struct clock_event_device decrementer_clockevent = {
109 .name = "decrementer", 109 .name = "decrementer",
110 .rating = 200, 110 .rating = 200,
111 .irq = 0, 111 .irq = 0,
112 .set_next_event = decrementer_set_next_event, 112 .set_next_event = decrementer_set_next_event,
113 .set_mode = decrementer_set_mode, 113 .set_mode = decrementer_set_mode,
114 .features = CLOCK_EVT_FEAT_ONESHOT, 114 .features = CLOCK_EVT_FEAT_ONESHOT,
115}; 115};
116 116
117struct decrementer_clock { 117struct decrementer_clock {
@@ -435,7 +435,7 @@ EXPORT_SYMBOL(profile_pc);
435/* 435/*
436 * This function recalibrates the timebase based on the 49-bit time-of-day 436 * This function recalibrates the timebase based on the 49-bit time-of-day
437 * value in the Titan chip. The Titan is much more accurate than the value 437 * value in the Titan chip. The Titan is much more accurate than the value
438 * returned by the service processor for the timebase frequency. 438 * returned by the service processor for the timebase frequency.
439 */ 439 */
440 440
441static int __init iSeries_tb_recal(void) 441static int __init iSeries_tb_recal(void)
@@ -636,9 +636,9 @@ static void generic_suspend_disable_irqs(void)
636 * with suspending. 636 * with suspending.
637 */ 637 */
638 638
639 set_dec(0x7fffffff); 639 set_dec(DECREMENTER_MAX);
640 local_irq_disable(); 640 local_irq_disable();
641 set_dec(0x7fffffff); 641 set_dec(DECREMENTER_MAX);
642} 642}
643 643
644static void generic_suspend_enable_irqs(void) 644static void generic_suspend_enable_irqs(void)
@@ -982,10 +982,10 @@ void __init time_init(void)
982 boot_tb = get_tb_or_rtc(); 982 boot_tb = get_tb_or_rtc();
983 983
984 /* If platform provided a timezone (pmac), we correct the time */ 984 /* If platform provided a timezone (pmac), we correct the time */
985 if (timezone_offset) { 985 if (timezone_offset) {
986 sys_tz.tz_minuteswest = -timezone_offset / 60; 986 sys_tz.tz_minuteswest = -timezone_offset / 60;
987 sys_tz.tz_dsttime = 0; 987 sys_tz.tz_dsttime = 0;
988 } 988 }
989 989
990 vdso_data->tb_update_count = 0; 990 vdso_data->tb_update_count = 0;
991 vdso_data->tb_ticks_per_sec = tb_ticks_per_sec; 991 vdso_data->tb_ticks_per_sec = tb_ticks_per_sec;