Commit ea54bca3 authored by George Spelvin's avatar George Spelvin Committed by John Stultz
Browse files

ntp: Make is_error_status() use its argument 



is_error_status() is an inline function always called with the
global time_status as an argument, so there's zero functional
difference with this change, but the non-CONFIG_NTP_PPS version
uses the passed-in argument, while the CONFIG_NTP_PPS one ignores
its argument and uses the global.

Looks like is_error_status was refactored out, but someone forgot
to change the logic to check the local argument value.

Thus this patch makes it use the argument always; shorter variable
names are good.

Signed-off-by: default avatarGeorge Spelvin <linux@horizon.com>
[jstultz: Tweaked commit message]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent cdafb93f

kernel/time/ntp.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -165,21 +165,21 @@ static inline void pps_set_freq(s64 freq) 




static inline int is_error_status(int status)

static inline int is_error_status(int status)

{

{

	return (time_status & (STA_UNSYNC|STA_CLOCKERR))

	return (status & (STA_UNSYNC|STA_CLOCKERR))

		/* PPS signal lost when either PPS time or

		/* PPS signal lost when either PPS time or

		 * PPS frequency synchronization requested

		 * PPS frequency synchronization requested

		 */

		 */

		|| ((time_status & (STA_PPSFREQ|STA_PPSTIME))

		|| ((status & (STA_PPSFREQ|STA_PPSTIME))

			&& !(time_status & STA_PPSSIGNAL))

			&& !(status & STA_PPSSIGNAL))

		/* PPS jitter exceeded when

		/* PPS jitter exceeded when

		 * PPS time synchronization requested */

		 * PPS time synchronization requested */

		|| ((time_status & (STA_PPSTIME|STA_PPSJITTER))

		|| ((status & (STA_PPSTIME|STA_PPSJITTER))

			== (STA_PPSTIME|STA_PPSJITTER))

			== (STA_PPSTIME|STA_PPSJITTER))

		/* PPS wander exceeded or calibration error when

		/* PPS wander exceeded or calibration error when

		 * PPS frequency synchronization requested

		 * PPS frequency synchronization requested

		 */

		 */

		|| ((time_status & STA_PPSFREQ)

		|| ((status & STA_PPSFREQ)

			&& (time_status & (STA_PPSWANDER|STA_PPSERROR)));

			&& (status & (STA_PPSWANDER|STA_PPSERROR)));

}

}





static inline void pps_fill_timex(struct timex *txc)

static inline void pps_fill_timex(struct timex *txc)

CRA Git | Maintained and supported by SUSTech CRA and CCSE