[PATCH RFC 02/14] sparc64: time: Remove architecture-specific clocksource data

[Thomas Weißschuh]

There is a dedicated field in 'struct clocksource' for the vDSO clock mode.

Use that field and get rid of 'select ARCH_CLOCKSOURCE_DATA'.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx>
---
 arch/sparc/Kconfig                   | 1 -
 arch/sparc/include/asm/clocksource.h | 4 ----
 arch/sparc/kernel/time_64.c          | 7 ++++---
 arch/sparc/kernel/vdso.c             | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 0f88123925a4f9f95b1b8336ff80798dacd243f5..742d1ad7fb9483b11d6d5aac607bf24815b7a237 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -102,7 +102,6 @@ config SPARC64
 	select ARCH_USE_QUEUED_RWLOCKS
 	select ARCH_USE_QUEUED_SPINLOCKS
 	select GENERIC_TIME_VSYSCALL
-	select ARCH_CLOCKSOURCE_DATA
 	select ARCH_HAS_PTE_SPECIAL
 	select PCI_DOMAINS if PCI
 	select ARCH_HAS_GIGANTIC_PAGE
diff --git a/arch/sparc/include/asm/clocksource.h b/arch/sparc/include/asm/clocksource.h
index d63ef224befebd68637d0be5d19c5cbf657d590d..81c59fdeb02e814ffac81397611ee63d684d64b1 100644
--- a/arch/sparc/include/asm/clocksource.h
+++ b/arch/sparc/include/asm/clocksource.h
@@ -10,8 +10,4 @@
 #define VCLOCK_TICK   1  /* Use %tick.  */
 #define VCLOCK_STICK  2  /* Use %stick. */
 
-struct arch_clocksource_data {
-	int vclock_mode;
-};
-
 #endif /* _ASM_SPARC_CLOCKSOURCE_H */
diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index b32f27f929d1ab49a5aa05cde60d3b88e90928ba..0077286b1f67ffc6b63c78709fbd66aaa3f3bedc 100644
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -48,6 +48,7 @@
 #include <linux/uaccess.h>
 #include <asm/irq_regs.h>
 #include <asm/cacheflush.h>
+#include <asm/clocksource.h>
 
 #include "entry.h"
 #include "kernel.h"
@@ -838,14 +839,14 @@ void __init time_init_early(void)
 	if (tlb_type == spitfire) {
 		if (is_hummingbird()) {
 			init_tick_ops(&hbtick_operations);
-			clocksource_tick.archdata.vclock_mode = VCLOCK_NONE;
+			clocksource_tick.vdso_clock_mode = VCLOCK_NONE;
 		} else {
 			init_tick_ops(&tick_operations);
-			clocksource_tick.archdata.vclock_mode = VCLOCK_TICK;
+			clocksource_tick.vdso_clock_mode = VCLOCK_TICK;
 		}
 	} else {
 		init_tick_ops(&stick_operations);
-		clocksource_tick.archdata.vclock_mode = VCLOCK_STICK;
+		clocksource_tick.vdso_clock_mode = VCLOCK_STICK;
 	}
 }
 
diff --git a/arch/sparc/kernel/vdso.c b/arch/sparc/kernel/vdso.c
index 0e27437eb97bff16aba53b1634c7e9fa7db20b46..a79937998a13b9142cc887dcaf6488571f9557eb 100644
--- a/arch/sparc/kernel/vdso.c
+++ b/arch/sparc/kernel/vdso.c
@@ -29,7 +29,7 @@ void update_vsyscall(struct timekeeper *tk)
 		return;
 
 	vvar_write_begin(vdata);
-	vdata->vclock_mode = tk->tkr_mono.clock->archdata.vclock_mode;
+	vdata->vclock_mode = tk->tkr_mono.clock->vdso_clock_mode;
 	vdata->clock.cycle_last = tk->tkr_mono.cycle_last;
 	vdata->clock.mask = tk->tkr_mono.mask;
 	vdata->clock.mult = tk->tkr_mono.mult;

-- 
2.50.1