[PATCH 03/74] clockevents/drivers/bcm2835: Migrate to new 'set-state' interface

Lee Jones lee at kernel.org
Tue Aug 11 08:31:50 PDT 2015


On Mon, 10 Aug 2015, Daniel Lezcano wrote:

> From: Viresh Kumar <viresh.kumar at linaro.org>
> 
> Migrate bcm2835 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.
> 
> We weren't doing anything in the ->set_mode() callback. So, this patch
> doesn't provide any set-state callbacks.
> 
> Acked-by: Daniel Lezcano <daniel.lezcano at linaro.org>
> Tested-by: Stephen Warren <swarren at wwwdotorg.org>
> Cc: Stephen Warren <swarren at wwwdotorg.org>
> Cc: Lee Jones <lee at kernel.org>
> Signed-off-by: Viresh Kumar <viresh.kumar at linaro.org>
> Signed-off-by: Daniel Lezcano <daniel.lezcano at linaro.org>
> ---
>  drivers/clocksource/bcm2835_timer.c | 16 ----------------
>  1 file changed, 16 deletions(-)

Looks fine.

Acked-by: Lee Jones <lee at kernel.org>

> diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c
> index 26ed331..6f28229 100644
> --- a/drivers/clocksource/bcm2835_timer.c
> +++ b/drivers/clocksource/bcm2835_timer.c
> @@ -54,21 +54,6 @@ static u64 notrace bcm2835_sched_read(void)
>  	return readl_relaxed(system_clock);
>  }
>  
> -static void bcm2835_time_set_mode(enum clock_event_mode mode,
> -	struct clock_event_device *evt_dev)
> -{
> -	switch (mode) {
> -	case CLOCK_EVT_MODE_ONESHOT:
> -	case CLOCK_EVT_MODE_UNUSED:
> -	case CLOCK_EVT_MODE_SHUTDOWN:
> -	case CLOCK_EVT_MODE_RESUME:
> -		break;
> -	default:
> -		WARN(1, "%s: unhandled event mode %d\n", __func__, mode);
> -		break;
> -	}
> -}
> -
>  static int bcm2835_time_set_next_event(unsigned long event,
>  	struct clock_event_device *evt_dev)
>  {
> @@ -129,7 +114,6 @@ static void __init bcm2835_timer_init(struct device_node *node)
>  	timer->evt.name = node->name;
>  	timer->evt.rating = 300;
>  	timer->evt.features = CLOCK_EVT_FEAT_ONESHOT;
> -	timer->evt.set_mode = bcm2835_time_set_mode;
>  	timer->evt.set_next_event = bcm2835_time_set_next_event;
>  	timer->evt.cpumask = cpumask_of(0);
>  	timer->act.name = node->name;



More information about the linux-rpi-kernel mailing list