timer fix

GIT PULL Ingo Molnar 1 participant 1 message Oct 18, 2016 Timekeeping, clocksource core, NTP, alarmtimer

lore

Share & tools

lore

Ingo Molnar

author

2016-10-18 11:18 UTC #0 lore raw

Linus,

Please pull the latest timers-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus

# HEAD: 54e23845e965898f65f76aba79fa9db76d830fa9 alarmtimer: Remove unused but set variable

Remove an unused variable.

Thanks,

Ingo

------------------>
Tobias Klauser (1):
alarmtimer: Remove unused but set variable

 kernel/time/alarmtimer.c | 2 --
 1 file changed, 2 deletions(-)

kernel/time/alarmtimer.c +0 -2

index c3aad685bbc0..12dd190634ab 100644
@@ -542,7 +542,6 @@ static int alarm_clock_get(clockid_t which_clock, struct timespec *tp)
 static int alarm_timer_create(struct k_itimer *new_timer)
 {
 	enum  alarmtimer_type type;
-	struct alarm_base *base;
 
 	if (!alarmtimer_get_rtcdev())
 		return -ENOTSUPP;

@@ -551,7 +550,6 @@ static int alarm_timer_create(struct k_itimer *new_timer)
 		return -EPERM;
 
 	type = clock2alarm(new_timer->it_clock);
-	base = &alarm_bases[type];
 	alarm_init(&new_timer->it.alarm.alarmtimer, type, alarm_handle_timer);
 	return 0;
 }