p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: George Spelvin <linux@horizon.com>
[jstultz: Tweaked commit message]
Signed-off-by: John Stultz <john.stultz@linaro.org>
This commit is contained in:
George Spelvin 2014-05-12 09:35:48 -04:00 committed by John Stultz
parent cdafb93feb
commit ea54bca3aa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/time/ntp.c
View File

@ -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)