RISC-V: Remove per cpu clocksource

There is only one clocksource in RISC-V. The boot cpu initializes
that clocksource. No need to keep a percpu data structure.

Signed-off-by: Atish Patra <atish.patra@wdc.com>
Signed-off-by: Paul Walmsley <paul.walmsley@sifive.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
Atish Patra 2019-08-02 21:27:20 -07:00 коммит произвёл Paul Walmsley
Родитель e21a712a96
Коммит 713203e303
1 изменённых файлов: 2 добавлений и 4 удалений

Просмотреть файл

@ -55,7 +55,7 @@ static u64 riscv_sched_clock(void)
return get_cycles64(); return get_cycles64();
} }
static DEFINE_PER_CPU(struct clocksource, riscv_clocksource) = { static struct clocksource riscv_clocksource = {
.name = "riscv_clocksource", .name = "riscv_clocksource",
.rating = 300, .rating = 300,
.mask = CLOCKSOURCE_MASK(64), .mask = CLOCKSOURCE_MASK(64),
@ -92,7 +92,6 @@ void riscv_timer_interrupt(void)
static int __init riscv_timer_init_dt(struct device_node *n) static int __init riscv_timer_init_dt(struct device_node *n)
{ {
int cpuid, hartid, error; int cpuid, hartid, error;
struct clocksource *cs;
hartid = riscv_of_processor_hartid(n); hartid = riscv_of_processor_hartid(n);
if (hartid < 0) { if (hartid < 0) {
@ -112,8 +111,7 @@ static int __init riscv_timer_init_dt(struct device_node *n)
pr_info("%s: Registering clocksource cpuid [%d] hartid [%d]\n", pr_info("%s: Registering clocksource cpuid [%d] hartid [%d]\n",
__func__, cpuid, hartid); __func__, cpuid, hartid);
cs = per_cpu_ptr(&riscv_clocksource, cpuid); error = clocksource_register_hz(&riscv_clocksource, riscv_timebase);
error = clocksource_register_hz(cs, riscv_timebase);
if (error) { if (error) {
pr_err("RISCV timer register failed [%d] for cpu = [%d]\n", pr_err("RISCV timer register failed [%d] for cpu = [%d]\n",
error, cpuid); error, cpuid);