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

Commit 0f9987b6 authored by Ondrej Mosnacek's avatar Ondrej Mosnacek Committed by John Stultz
Browse files

ntp: Remove redundant arguments 



The 'ts' argument of process_adj_status() and process_adjtimex_modes()
is unused and can be safely removed.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarOndrej Mosnacek <omosnace@redhat.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent c6bb1114

kernel/time/ntp.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -642,7 +642,7 @@ void ntp_notify_cmos_timer(void) 
/*

/*

 * Propagate a new txc->status value into the NTP state:

 * Propagate a new txc->status value into the NTP state:

 */

 */

static inline void process_adj_status(struct timex *txc, struct timespec64 *ts)

static inline void process_adj_status(struct timex *txc)

{

{

	if ((time_status & STA_PLL) && !(txc->status & STA_PLL)) {

	if ((time_status & STA_PLL) && !(txc->status & STA_PLL)) {

		time_state = TIME_OK;

		time_state = TIME_OK;
@@ -665,12 +665,10 @@ static inline void process_adj_status(struct timex *txc, struct timespec64 *ts) 
}

}









static inline void process_adjtimex_modes(struct timex *txc,

static inline void process_adjtimex_modes(struct timex *txc, s32 *time_tai)

						struct timespec64 *ts,

						s32 *time_tai)

{

{

	if (txc->modes & ADJ_STATUS)

	if (txc->modes & ADJ_STATUS)

		process_adj_status(txc, ts);

		process_adj_status(txc);





	if (txc->modes & ADJ_NANO)

	if (txc->modes & ADJ_NANO)

		time_status |= STA_NANO;

		time_status |= STA_NANO;
@@ -735,7 +733,7 @@ int __do_adjtimex(struct timex *txc, struct timespec64 *ts, s32 *time_tai) 




		/* If there are input parameters, then process them: */

		/* If there are input parameters, then process them: */

		if (txc->modes)

		if (txc->modes)

			process_adjtimex_modes(txc, ts, time_tai);

			process_adjtimex_modes(txc, time_tai);





		txc->offset = shift_right(time_offset * NTP_INTERVAL_FREQ,

		txc->offset = shift_right(time_offset * NTP_INTERVAL_FREQ,

				  NTP_SCALE_SHIFT);

				  NTP_SCALE_SHIFT);