hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Gleixner 2011-02-01 13:51:56 +00:00
parent e5e542eea9
commit ebaac757ac
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/char/mmtimer.c
View File

@ -768,12 +768,11 @@ static int sgi_timer_set(struct k_itimer *timr, int flags,
static int sgi_clock_getres(const clockid_t which_clock, struct timespec *tp) static int sgi_clock_getres(const clockid_t which_clock, struct timespec *tp)
{ {
tp->tv_sec = 0; tp->tv_sec = 0;
tp->tv_nsec = sgi_clock.res; tp->tv_nsec = sgi_clock_period;
return 0; return 0;
} }
static struct k_clock sgi_clock = { static struct k_clock sgi_clock = {
.res = 0,
.clock_set = sgi_clock_set, .clock_set = sgi_clock_set,
.clock_get = sgi_clock_get, .clock_get = sgi_clock_get,
.clock_getres = sgi_clock_getres, .clock_getres = sgi_clock_getres,
@ -840,7 +839,7 @@ static int __init mmtimer_init(void)
(unsigned long) node); (unsigned long) node);
} }
sgi_clock_period = sgi_clock.res = NSEC_PER_SEC / sn_rtc_cycles_per_second; sgi_clock_period = NSEC_PER_SEC / sn_rtc_cycles_per_second;
register_posix_clock(CLOCK_SGI_CYCLE, &sgi_clock); register_posix_clock(CLOCK_SGI_CYCLE, &sgi_clock);
printk(KERN_INFO "%s: v%s, %ld MHz\n", MMTIMER_DESC, MMTIMER_VERSION, printk(KERN_INFO "%s: v%s, %ld MHz\n", MMTIMER_DESC, MMTIMER_VERSION,

1
include/linux/posix-timers.h
View File

@ -67,7 +67,6 @@ struct k_itimer {
}; };
struct k_clock { struct k_clock {
int res; /* in nanoseconds */
int (*clock_getres) (const clockid_t which_clock, struct timespec *tp); int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);
int (*clock_set) (const clockid_t which_clock, int (*clock_set) (const clockid_t which_clock,
const struct timespec *tp); const struct timespec *tp);

2
kernel/posix-timers.c
View File

@ -204,8 +204,6 @@ static inline int invalid_clockid(const clockid_t which_clock)
return 1; return 1;
if (posix_clocks[which_clock].clock_getres != NULL) if (posix_clocks[which_clock].clock_getres != NULL)
return 0; return 0;
if (posix_clocks[which_clock].res != 0)
return 0;
return 1; return 1;
} }