Commit d0f4c739 authored by Yu Liao's avatar Yu Liao
Browse files

sw64: Do not use timer namespace for timer_shutdown() function 

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I7R8WG



--------------------------------

A new "shutdown" timer state is being added to the generic timer code. One
of the functions to change the timer into the state is called
"timer_shutdown()". This means that there can not be other functions
called "timer_shutdown()" as the timer code owns the "timer_*" name space.

Rename timer_shutdown() to sw64_timer_shutdown() to avoid this conflict.

Signed-off-by: default avatarYu Liao <liaoyu15@huawei.com>
parent 3e0e7195

arch/sw_64/kernel/timer.c

+4 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


static int timer_next_event(unsigned long delta,

		struct clock_event_device *evt);

static int timer_shutdown(struct clock_event_device *evt);

static int sw64_timer_shutdown(struct clock_event_device *evt);

static int timer_set_oneshot(struct clock_event_device *evt);



/*
@@ -23,7 +23,7 @@ static struct clock_event_device timer_clockevent = { 
	.features		= CLOCK_EVT_FEAT_ONESHOT,

	.shift			= 20,

	.mult			= 0,

	.set_state_shutdown	= timer_shutdown,

	.set_state_shutdown	= sw64_timer_shutdown,

	.set_state_oneshot	= timer_set_oneshot,

	.set_next_event		= timer_next_event,

	.rating			= 300,
@@ -71,7 +71,7 @@ static int timer_next_event(unsigned long delta, 
	return 0;

}



static int timer_shutdown(struct clock_event_device *evt)

static int sw64_timer_shutdown(struct clock_event_device *evt)

{

	wrtimer(0);

	return 0;
@@ -134,7 +134,7 @@ void sw64_timer_interrupt(void) 
	if (!evt->event_handler) {

		pr_warn("Spurious local timer interrupt on cpu %d\n",

				smp_processor_id());

		timer_shutdown(evt);

		sw64_timer_shutdown(evt);

		return;

	}