Commit 40d9f827 authored by Stephen Boyd's avatar Stephen Boyd Committed by John Stultz
Browse files

timekeeping: Remove unused timekeeping_{get,set}_tai_offset() 



The last caller to timekeeping_set_tai_offset() was in commit
0b5154fb (timekeeping: Simplify tai updating from
do_adjtimex, 2013-03-22) and the last caller to
timekeeping_get_tai_offset() was in commit 76f41088 (hrtimer:
Cleanup hrtimer accessors to the timekepeing state, 2014-07-16).
Remove these unused functions now that we handle TAI offsets
differently.

Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 0c744ea4

kernel/time/timekeeping.c

+1 −38
Original line number Diff line number Diff line
@@ -1275,27 +1275,8 @@ error: /* even if we error out, we forwarded the time, so call update */ 
}

EXPORT_SYMBOL(timekeeping_inject_offset);





/**

 * timekeeping_get_tai_offset - Returns current TAI offset from UTC

 *

 */

s32 timekeeping_get_tai_offset(void)

{

	struct timekeeper *tk = &tk_core.timekeeper;

	unsigned int seq;

	s32 ret;



	do {

		seq = read_seqcount_begin(&tk_core.seq);

		ret = tk->tai_offset;

	} while (read_seqcount_retry(&tk_core.seq, seq));



	return ret;

}



/**

 * __timekeeping_set_tai_offset - Lock free worker function

 * __timekeeping_set_tai_offset - Sets the TAI offset from UTC and monotonic

 *

 */

static void __timekeeping_set_tai_offset(struct timekeeper *tk, s32 tai_offset)
@@ -1304,24 +1285,6 @@ static void __timekeeping_set_tai_offset(struct timekeeper *tk, s32 tai_offset) 
	tk->offs_tai = ktime_add(tk->offs_real, ktime_set(tai_offset, 0));

}



/**

 * timekeeping_set_tai_offset - Sets the current TAI offset from UTC

 *

 */

void timekeeping_set_tai_offset(s32 tai_offset)

{

	struct timekeeper *tk = &tk_core.timekeeper;

	unsigned long flags;



	raw_spin_lock_irqsave(&timekeeper_lock, flags);

	write_seqcount_begin(&tk_core.seq);

	__timekeeping_set_tai_offset(tk, tai_offset);

	timekeeping_update(tk, TK_MIRROR | TK_CLOCK_WAS_SET);

	write_seqcount_end(&tk_core.seq);

	raw_spin_unlock_irqrestore(&timekeeper_lock, flags);

	clock_was_set();

}



/**

 * change_clocksource - Swaps clocksources if a new one is available

 *

kernel/time/timekeeping.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ extern ktime_t ktime_get_update_offsets_now(unsigned int *cwsseq, 
extern int timekeeping_valid_for_hres(void);

extern u64 timekeeping_max_deferment(void);

extern int timekeeping_inject_offset(struct timespec *ts);

extern s32 timekeeping_get_tai_offset(void);

extern void timekeeping_set_tai_offset(s32 tai_offset);

extern int timekeeping_suspend(void);

extern void timekeeping_resume(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE