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

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

clockevents/drivers/em_sti: Migrate to new 'set-state' interface 



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

This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.

NOTE: This also drops a special check:

	if (old_mode == CLOCK_EVT_MODE_ONESHOT)
		em_sti_stop(p, USER_CLOCKEVENT);

as it doesn't look like that important. This driver only supports
ONESHOT and we can only move only to SHUTDOWN from ONESHOT and.
Also on second call (on shutdown), em_sti_stop() would return without
disabling the device again.

Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 8f9327cb

drivers/clocksource/em_sti.c

+14 −25
Original line number Original line Diff line number Diff line
@@ -251,33 +251,21 @@ static struct em_sti_priv *ced_to_em_sti(struct clock_event_device *ced) 
	return container_of(ced, struct em_sti_priv, ced);

	return container_of(ced, struct em_sti_priv, ced);

}

}





static void em_sti_clock_event_mode(enum clock_event_mode mode,

static int em_sti_clock_event_shutdown(struct clock_event_device *ced)

				    struct clock_event_device *ced)

{

{

	struct em_sti_priv *p = ced_to_em_sti(ced);

	struct em_sti_priv *p = ced_to_em_sti(ced);



	/* deal with old setting first */

	switch (ced->mode) {

	case CLOCK_EVT_MODE_ONESHOT:

	em_sti_stop(p, USER_CLOCKEVENT);

	em_sti_stop(p, USER_CLOCKEVENT);

		break;

	return 0;

	default:

		break;

}

}





	switch (mode) {

static int em_sti_clock_event_set_oneshot(struct clock_event_device *ced)

	case CLOCK_EVT_MODE_ONESHOT:

{

	struct em_sti_priv *p = ced_to_em_sti(ced);



	dev_info(&p->pdev->dev, "used for oneshot clock events\n");

	dev_info(&p->pdev->dev, "used for oneshot clock events\n");

	em_sti_start(p, USER_CLOCKEVENT);

	em_sti_start(p, USER_CLOCKEVENT);

	clockevents_config(&p->ced, p->rate);

	clockevents_config(&p->ced, p->rate);

		break;

	return 0;

	case CLOCK_EVT_MODE_SHUTDOWN:

	case CLOCK_EVT_MODE_UNUSED:

		em_sti_stop(p, USER_CLOCKEVENT);

		break;

	default:

		break;

	}

}

}





static int em_sti_clock_event_next(unsigned long delta,

static int em_sti_clock_event_next(unsigned long delta,
@@ -303,11 +291,12 @@ static void em_sti_register_clockevent(struct em_sti_priv *p) 
	ced->rating = 200;

	ced->rating = 200;

	ced->cpumask = cpu_possible_mask;

	ced->cpumask = cpu_possible_mask;

	ced->set_next_event = em_sti_clock_event_next;

	ced->set_next_event = em_sti_clock_event_next;

	ced->set_mode = em_sti_clock_event_mode;

	ced->set_state_shutdown = em_sti_clock_event_shutdown;

	ced->set_state_oneshot = em_sti_clock_event_set_oneshot;





	dev_info(&p->pdev->dev, "used for clock events\n");

	dev_info(&p->pdev->dev, "used for clock events\n");





	/* Register with dummy 1 Hz value, gets updated in ->set_mode() */

	/* Register with dummy 1 Hz value, gets updated in ->set_state_oneshot() */

	clockevents_config_and_register(ced, 1, 2, 0xffffffff);

	clockevents_config_and_register(ced, 1, 2, 0xffffffff);

}

}