diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-01 08:51:56 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-02 09:28:15 -0500 |
commit | ebaac757acae0431e2c79c00e09f1debdabbddd7 (patch) | |
tree | 3f5dbd5cdb4cd6effd1556e65b4885edc8e269de /drivers/char/mmtimer.c | |
parent | e5e542eea9075dd008993c2ee80b2cc9f31fc494 (diff) |
posix-timers: Remove useless res field from k_clock
The res member of kclock is only used by mmtimer.c, but even there it
contains redundant information. Remove the field and fixup mmtimer.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: John Stultz <johnstul@us.ibm.com>
Tested-by: Richard Cochran <richard.cochran@omicron.at>
LKML-Reference: <20110201134418.808714587@linutronix.de>
Diffstat (limited to 'drivers/char/mmtimer.c')
-rw-r--r-- | drivers/char/mmtimer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c index 141ffaeb976c..ff41eb3eec92 100644 --- a/drivers/char/mmtimer.c +++ b/drivers/char/mmtimer.c | |||
@@ -768,12 +768,11 @@ static int sgi_timer_set(struct k_itimer *timr, int flags, | |||
768 | static int sgi_clock_getres(const clockid_t which_clock, struct timespec *tp) | 768 | static int sgi_clock_getres(const clockid_t which_clock, struct timespec *tp) |
769 | { | 769 | { |
770 | tp->tv_sec = 0; | 770 | tp->tv_sec = 0; |
771 | tp->tv_nsec = sgi_clock.res; | 771 | tp->tv_nsec = sgi_clock_period; |
772 | return 0; | 772 | return 0; |
773 | } | 773 | } |
774 | 774 | ||
775 | static struct k_clock sgi_clock = { | 775 | static struct k_clock sgi_clock = { |
776 | .res = 0, | ||
777 | .clock_set = sgi_clock_set, | 776 | .clock_set = sgi_clock_set, |
778 | .clock_get = sgi_clock_get, | 777 | .clock_get = sgi_clock_get, |
779 | .clock_getres = sgi_clock_getres, | 778 | .clock_getres = sgi_clock_getres, |
@@ -840,7 +839,7 @@ static int __init mmtimer_init(void) | |||
840 | (unsigned long) node); | 839 | (unsigned long) node); |
841 | } | 840 | } |
842 | 841 | ||
843 | sgi_clock_period = sgi_clock.res = NSEC_PER_SEC / sn_rtc_cycles_per_second; | 842 | sgi_clock_period = NSEC_PER_SEC / sn_rtc_cycles_per_second; |
844 | register_posix_clock(CLOCK_SGI_CYCLE, &sgi_clock); | 843 | register_posix_clock(CLOCK_SGI_CYCLE, &sgi_clock); |
845 | 844 | ||
846 | printk(KERN_INFO "%s: v%s, %ld MHz\n", MMTIMER_DESC, MMTIMER_VERSION, | 845 | printk(KERN_INFO "%s: v%s, %ld MHz\n", MMTIMER_DESC, MMTIMER_VERSION, |