| Message ID | 20181207134824.300024-9-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | e4b92b108c6cd6b311e4b6e85d6a87a34599a6e3 |
| Headers | show |
| Series | timekeeping: cleanups | expand |
On Fri, Dec 7, 2018 at 5:49 AM Arnd Bergmann <arnd@arndb.de> wrote: > > There are no more remaining users of these deprecated wrappers, so > let's remove them before new users have a chance to make it in. > > See Documentation/core-api/timekeeping.rst for replacements when > porting old drivers that contain calls to this function. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > include/linux/timekeeping.h | 14 -------------- > include/linux/timekeeping32.h | 9 --------- > 2 files changed, 23 deletions(-) Acked-by: John Stultz <john.stultz@linaro.org>
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index 29975e93fcb8..a8ab0f143ac4 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -262,18 +262,4 @@ void read_persistent_wall_and_boot_offset(struct timespec64 *wall_clock, struct timespec64 *boot_offset); extern int update_persistent_clock64(struct timespec64 now); -/* - * deprecated aliases, don't use in new code - */ -#define getnstimeofday64(ts) ktime_get_real_ts64(ts) - -static inline struct timespec64 current_kernel_time64(void) -{ - struct timespec64 ts; - - ktime_get_coarse_real_ts64(&ts); - - return ts; -} - #endif diff --git a/include/linux/timekeeping32.h b/include/linux/timekeeping32.h index 0036ff314ac5..cc59cc9e0e84 100644 --- a/include/linux/timekeeping32.h +++ b/include/linux/timekeeping32.h @@ -6,15 +6,6 @@ * over time so we can remove the file here. */ -static inline void do_gettimeofday(struct timeval *tv) -{ - struct timespec64 now; - - ktime_get_real_ts64(&now); - tv->tv_sec = now.tv_sec; - tv->tv_usec = now.tv_nsec/1000; -} - static inline unsigned long get_seconds(void) { return ktime_get_real_seconds();
There are no more remaining users of these deprecated wrappers, so let's remove them before new users have a chance to make it in. See Documentation/core-api/timekeeping.rst for replacements when porting old drivers that contain calls to this function. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- include/linux/timekeeping.h | 14 -------------- include/linux/timekeeping32.h | 9 --------- 2 files changed, 23 deletions(-) -- 2.18.0