Skip to content

Commit

Permalink
ntp: Cleanup timex.h
Browse files Browse the repository at this point in the history
Move ntp_sycned to ntp.c and mark time_status as static.
Also yank function declaration for non-existant function.

CC: Thomas Gleixner <tglx@linutronix.de>
CC: Eric Dumazet <eric.dumazet@gmail.com>
CC: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
  • Loading branch information
John Stultz committed Jan 27, 2012
1 parent 70471f2 commit 8357929
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 16 deletions.
15 changes: 0 additions & 15 deletions include/linux/timex.h
Original file line number Diff line number Diff line change
Expand Up @@ -234,23 +234,9 @@ struct timex {
extern unsigned long tick_usec; /* USER_HZ period (usec) */
extern unsigned long tick_nsec; /* ACTHZ period (nsec) */

/*
* phase-lock loop variables
*/
extern int time_status; /* clock synchronization status bits */

extern void ntp_init(void);
extern void ntp_clear(void);

/**
* ntp_synced - Returns 1 if the NTP status is not UNSYNC
*
*/
static inline int ntp_synced(void)
{
return !(time_status & STA_UNSYNC);
}

/* Required to safely shift negative values */
#define shift_right(x, s) ({ \
__typeof__(x) __x = (x); \
Expand All @@ -267,7 +253,6 @@ static inline int ntp_synced(void)
extern u64 tick_length;

extern void second_overflow(void);
extern void update_ntp_one_tick(void);
extern int do_adjtimex(struct timex *);
extern void hardpps(const struct timespec *, const struct timespec *);

Expand Down
13 changes: 12 additions & 1 deletion kernel/time/ntp.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ static struct hrtimer leap_timer;
static int time_state = TIME_OK;

/* clock status bits: */
int time_status = STA_UNSYNC;
static int time_status = STA_UNSYNC;

/* TAI offset (secs): */
static long time_tai;
Expand Down Expand Up @@ -233,6 +233,17 @@ static inline void pps_fill_timex(struct timex *txc)

#endif /* CONFIG_NTP_PPS */


/**
* ntp_synced - Returns 1 if the NTP status is not UNSYNC
*
*/
static inline int ntp_synced(void)
{
return !(time_status & STA_UNSYNC);
}


/*
* NTP methods:
*/
Expand Down

0 comments on commit 8357929

Please sign in to comment.