Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebaac757 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Tested-by: default avatarRichard Cochran <richard.cochran@omicron.at>
LKML-Reference: <20110201134418.808714587@linutronix.de>
parent e5e542ee

drivers/char/mmtimer.c

+2 −3
Original line number Diff line number Diff line
@@ -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)

{

	tp->tv_sec = 0;

	tp->tv_nsec = sgi_clock.res;

	tp->tv_nsec = sgi_clock_period;

	return 0;

}



static struct k_clock sgi_clock = {

	.res = 0,

	.clock_set	= sgi_clock_set,

	.clock_get	= sgi_clock_get,

	.clock_getres	= sgi_clock_getres,
@@ -840,7 +839,7 @@ static int __init mmtimer_init(void) 
			(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);



	printk(KERN_INFO "%s: v%s, %ld MHz\n", MMTIMER_DESC, MMTIMER_VERSION,

include/linux/posix-timers.h

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ struct k_itimer { 
};



struct k_clock {

	int res;		/* in nanoseconds */

	int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);

	int (*clock_set) (const clockid_t which_clock,

			  const struct timespec *tp);

kernel/posix-timers.c

+0 −2
Original line number Diff line number Diff line
@@ -204,8 +204,6 @@ static inline int invalid_clockid(const clockid_t which_clock) 
		return 1;

	if (posix_clocks[which_clock].clock_getres != NULL)

		return 0;

	if (posix_clocks[which_clock].res != 0)

		return 0;

	return 1;

}