Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecbebcb8 authored by Viresh Kumar's avatar Viresh Kumar Committed by Daniel Lezcano
Browse files

kernel: broadcast-hrtimer: Migrate to new 'set-state' interface 



Migrate broadcast-hrtimer driver to the new 'set-state' interface
provided by clockevents core, the earlier 'set-mode' interface is marked
obsolete now.

Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 8e40fc4b

kernel/time/tick-broadcast-hrtimer.c

+20 −29
Original line number Original line Diff line number Diff line
@@ -18,12 +18,8 @@ 




static struct hrtimer bctimer;

static struct hrtimer bctimer;





static void bc_set_mode(enum clock_event_mode mode,

static int bc_shutdown(struct clock_event_device *evt)

			struct clock_event_device *bc)

{

{

	switch (mode) {

	case CLOCK_EVT_MODE_UNUSED:

	case CLOCK_EVT_MODE_SHUTDOWN:

	/*

	/*

	 * Note, we cannot cancel the timer here as we might

	 * Note, we cannot cancel the timer here as we might

	 * run into the following live lock scenario:

	 * run into the following live lock scenario:
@@ -38,10 +34,7 @@ static void bc_set_mode(enum clock_event_mode mode, 
	 *  wait_for_callback()

	 *  wait_for_callback()

	 */

	 */

	hrtimer_try_to_cancel(&bctimer);

	hrtimer_try_to_cancel(&bctimer);

		break;

	return 0;

	default:

		break;

	}

}

}





/*

/*
@@ -82,7 +75,7 @@ static int bc_set_next(ktime_t expires, struct clock_event_device *bc) 
}

}





static struct clock_event_device ce_broadcast_hrtimer = {

static struct clock_event_device ce_broadcast_hrtimer = {

	.set_mode		= bc_set_mode,

	.set_state_shutdown	= bc_shutdown,

	.set_next_ktime		= bc_set_next,

	.set_next_ktime		= bc_set_next,

	.features		= CLOCK_EVT_FEAT_ONESHOT |

	.features		= CLOCK_EVT_FEAT_ONESHOT |

				  CLOCK_EVT_FEAT_KTIME |

				  CLOCK_EVT_FEAT_KTIME |
@@ -102,14 +95,12 @@ static enum hrtimer_restart bc_handler(struct hrtimer *t) 
{

{

	ce_broadcast_hrtimer.event_handler(&ce_broadcast_hrtimer);

	ce_broadcast_hrtimer.event_handler(&ce_broadcast_hrtimer);





	switch (ce_broadcast_hrtimer.mode) {

	if (clockevent_state_oneshot(&ce_broadcast_hrtimer))

	case CLOCK_EVT_MODE_ONESHOT:

		if (ce_broadcast_hrtimer.next_event.tv64 != KTIME_MAX)

		if (ce_broadcast_hrtimer.next_event.tv64 != KTIME_MAX)

			return HRTIMER_RESTART;

			return HRTIMER_RESTART;

	default:



	return HRTIMER_NORESTART;

	return HRTIMER_NORESTART;

}

}

}





void tick_setup_hrtimer_broadcast(void)

void tick_setup_hrtimer_broadcast(void)

{

{