Commit 92661788 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

timekeeping: remove unused {read,update}_persistent_clock 



After arch/sh has removed the last reference to these functions,
we can remove them completely and just rely on the 64-bit time_t
based versions. This cleans up a rather ugly use of __weak
functions.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 19f48591

include/linux/timekeeping32.h

+0 −6
Original line number Diff line number Diff line
@@ -52,10 +52,4 @@ static inline void getboottime(struct timespec *ts) 
	*ts = timespec64_to_timespec(ts64);

}



/*

 * Persistent clock related interfaces

 */

extern void read_persistent_clock(struct timespec *ts);

extern int update_persistent_clock(struct timespec now);



#endif

kernel/time/ntp.c

+1 −9
Original line number Diff line number Diff line
@@ -555,17 +555,9 @@ static void sync_rtc_clock(void) 
}



#ifdef CONFIG_GENERIC_CMOS_UPDATE

int __weak update_persistent_clock(struct timespec now)

{

	return -ENODEV;

}



int __weak update_persistent_clock64(struct timespec64 now64)

{

	struct timespec now;



	now = timespec64_to_timespec(now64);

	return update_persistent_clock(now);

	return -ENODEV;

}

#endif

kernel/time/timekeeping.c

+2 −10
Original line number Diff line number Diff line
@@ -1467,7 +1467,7 @@ u64 timekeeping_max_deferment(void) 
}



/**

 * read_persistent_clock -  Return time from the persistent clock.

 * read_persistent_clock64 -  Return time from the persistent clock.

 *

 * Weak dummy function for arches that do not yet support it.

 * Reads the time from the battery backed persistent clock.
@@ -1475,20 +1475,12 @@ u64 timekeeping_max_deferment(void) 
 *

 *  XXX - Do be sure to remove it once all arches implement it.

 */

void __weak read_persistent_clock(struct timespec *ts)

void __weak read_persistent_clock64(struct timespec64 *ts)

{

	ts->tv_sec = 0;

	ts->tv_nsec = 0;

}



void __weak read_persistent_clock64(struct timespec64 *ts64)

{

	struct timespec ts;



	read_persistent_clock(&ts);

	*ts64 = timespec_to_timespec64(ts);

}



/**

 * read_persistent_wall_and_boot_offset - Read persistent clock, and also offset

 *                                        from the boot.

CRA Git | Maintained and supported by SUSTech CRA and CCSE