diff options
author | Pavel Tatashin <pasha.tatashin@oracle.com> | 2018-07-19 16:55:37 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2018-07-19 18:02:41 -0400 |
commit | 227e3958a780499b3ec41c36d4752ac4f4962874 (patch) | |
tree | d1e1c29ca93ae37d379bb850c01896fccf953789 /arch/arm/kernel/time.c | |
parent | 00067a6db2e95f3b9d9a017b3be3c715d54cc0de (diff) |
ARM/time: Remove read_boot_clock64()
read_boot_clock64() is deleted, and replaced with
read_persistent_wall_and_boot_offset().
The default implementation of read_persistent_wall_and_boot_offset()
provides a better fallback than the current stubs for read_boot_clock64()
that arm has with no users, so remove the old code.
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: steven.sistare@oracle.com
Cc: daniel.m.jordan@oracle.com
Cc: linux@armlinux.org.uk
Cc: schwidefsky@de.ibm.com
Cc: heiko.carstens@de.ibm.com
Cc: john.stultz@linaro.org
Cc: sboyd@codeaurora.org
Cc: hpa@zytor.com
Cc: douly.fnst@cn.fujitsu.com
Cc: peterz@infradead.org
Cc: prarit@redhat.com
Cc: feng.tang@intel.com
Cc: pmladek@suse.com
Cc: gnomes@lxorguk.ukuu.org.uk
Cc: linux-s390@vger.kernel.org
Cc: boris.ostrovsky@oracle.com
Cc: jgross@suse.com
Cc: pbonzini@redhat.com
Link: https://lkml.kernel.org/r/20180719205545.16512-19-pasha.tatashin@oracle.com
Diffstat (limited to 'arch/arm/kernel/time.c')
-rw-r--r-- | arch/arm/kernel/time.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index cf2701cb0de8..078b259ead4e 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c | |||
@@ -83,29 +83,18 @@ static void dummy_clock_access(struct timespec64 *ts) | |||
83 | } | 83 | } |
84 | 84 | ||
85 | static clock_access_fn __read_persistent_clock = dummy_clock_access; | 85 | static clock_access_fn __read_persistent_clock = dummy_clock_access; |
86 | static clock_access_fn __read_boot_clock = dummy_clock_access; | ||
87 | 86 | ||
88 | void read_persistent_clock64(struct timespec64 *ts) | 87 | void read_persistent_clock64(struct timespec64 *ts) |
89 | { | 88 | { |
90 | __read_persistent_clock(ts); | 89 | __read_persistent_clock(ts); |
91 | } | 90 | } |
92 | 91 | ||
93 | void read_boot_clock64(struct timespec64 *ts) | 92 | int __init register_persistent_clock(clock_access_fn read_persistent) |
94 | { | ||
95 | __read_boot_clock(ts); | ||
96 | } | ||
97 | |||
98 | int __init register_persistent_clock(clock_access_fn read_boot, | ||
99 | clock_access_fn read_persistent) | ||
100 | { | 93 | { |
101 | /* Only allow the clockaccess functions to be registered once */ | 94 | /* Only allow the clockaccess functions to be registered once */ |
102 | if (__read_persistent_clock == dummy_clock_access && | 95 | if (__read_persistent_clock == dummy_clock_access) { |
103 | __read_boot_clock == dummy_clock_access) { | ||
104 | if (read_boot) | ||
105 | __read_boot_clock = read_boot; | ||
106 | if (read_persistent) | 96 | if (read_persistent) |
107 | __read_persistent_clock = read_persistent; | 97 | __read_persistent_clock = read_persistent; |
108 | |||
109 | return 0; | 98 | return 0; |
110 | } | 99 | } |
111 | 100 | ||