[PATCH V3 6/8] clockevents: drivers/: migrate to ->set_dev_mode()

23 May 2014

Clockevents core now supports ->set_dev_mode() (as a replacement to
->set_mode()), with capability to return error codes.
Migrate all drivers in 'drivers/clocksource' to implement this new callback.
Drivers now return -ENOSYS when a unsupported mode is passed to their
->set_dev_mode() callbacks and return 0 on success.
Most of the changes are automated with help of Coccinelle
(http://coccinelle.lip6.fr/) and the ones left are around the switch block which
are handled manually.
Some drivers had a WARN()/BUG()/pr_err()/empty-implementation for unsupported
modes. These statements and unsupported modes are removed now as proper error
handling with a WARN_ON() is done at clockevents core.
A simplified version of the semantic patch is:
@@
identifier m,c,setmode;
@@
-void
+int
setmode(enum clock_event_mode m, struct clock_event_device *c);
@@
identifier setmode;
@@
-void
+int
setmode(enum clock_event_mode, struct clock_event_device *);
@fixret@
identifier m,c,setmode;
@@
-void
+int
setmode(enum clock_event_mode m, struct clock_event_device *c)
 {
 ...
+ return 0;
 }
@depends on fixret@
identifier ced;
identifier fixret.setmode;
@@
... struct clock_event_device ced = {
...,
-.set_mode
+.set_dev_mode
= setmode,
};
@depends on fixret@
expression ced;
identifier fixret.setmode;
@@
- ced->set_mode
+ ced->set_dev_mode
= setmode
@depends on fixret@
identifier fixret.setmode;
@@
{
.
-set_mode
+set_dev_mode
= setmode
}
@depends on fixret@
expression ced;
identifier fixret.setmode;
@@
- ced.set_mode
+ ced.set_dev_mode
= setmode
Signed-off-by: Viresh Kumar viresh.kumar@linaro.org
---
 drivers/clocksource/arm_arch_timer.c     | 36 ++++++++++++++++++--------------
 drivers/clocksource/arm_global_timer.c   |  9 +++++---
 drivers/clocksource/bcm2835_timer.c      |  8 +++----
 drivers/clocksource/bcm_kona_timer.c     | 10 ++++++---
 drivers/clocksource/cadence_ttc_timer.c  |  7 +++++--
 drivers/clocksource/cs5535-clockevt.c    | 17 ++++++++++++---
 drivers/clocksource/dummy_timer.c        | 15 +++++++++++--
 drivers/clocksource/dw_apb_timer.c       |  7 +++++--
 drivers/clocksource/em_sti.c             | 11 ++++++----
 drivers/clocksource/exynos_mct.c         | 16 +++++++++-----
 drivers/clocksource/i8253.c              |  8 +++++--
 drivers/clocksource/metag_generic.c      | 11 +++++-----
 drivers/clocksource/moxart_timer.c       |  8 ++++---
 drivers/clocksource/mxs_timer.c          | 10 ++++-----
 drivers/clocksource/nomadik-mtu.c        |  7 +++++--
 drivers/clocksource/qcom-timer.c         | 11 +++++-----
 drivers/clocksource/samsung_pwm_timer.c  |  7 +++++--
 drivers/clocksource/sh_cmt.c             |  9 +++++---
 drivers/clocksource/sh_mtu2.c            |  9 +++++---
 drivers/clocksource/sh_tmu.c             |  9 +++++---
 drivers/clocksource/sun4i_timer.c        |  9 +++++---
 drivers/clocksource/tcb_clksrc.c         | 11 +++++++---
 drivers/clocksource/tegra20_timer.c      |  7 +++++--
 drivers/clocksource/time-armada-370-xp.c | 20 ++++++++++++------
 drivers/clocksource/time-efm32.c         |  7 +++++--
 drivers/clocksource/time-orion.c         | 17 +++++++++++----
 drivers/clocksource/timer-keystone.c     |  9 +++++---
 drivers/clocksource/timer-marco.c        | 10 ++++++---
 drivers/clocksource/timer-prima2.c       | 10 ++++-----
 drivers/clocksource/timer-sun5i.c        | 10 ++++++---
 drivers/clocksource/timer-u300.c         |  7 +++++--
 drivers/clocksource/vf_pit_timer.c       | 12 ++++++++---
 drivers/clocksource/vt8500_timer.c       |  8 ++++---
 drivers/clocksource/zevio-timer.c        |  9 ++++----
 34 files changed, 246 insertions(+), 125 deletions(-)

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 5163ec1..44f1eaa 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -179,7 +179,7 @@ static irqreturn_t arch_timer_handler_virt_mem(int irq, void *dev_id)
    return timer_handler(ARCH_TIMER_MEM_VIRT_ACCESS, evt);
 }
-static __always_inline void timer_set_mode(const int access, int mode,
+static __always_inline int timer_set_mode(const int access, int mode,
    			  struct clock_event_device *clk)
 {
    unsigned long ctrl;
@@ -190,33 +190,37 @@ static __always_inline void timer_set_mode(const int access, int mode,
    	ctrl &= ~ARCH_TIMER_CTRL_ENABLE;
    	arch_timer_reg_write(access, ARCH_TIMER_REG_CTRL, ctrl, clk);
    	break;
-	default:
+	case CLOCK_EVT_MODE_ONESHOT:
+	case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
-static void arch_timer_set_mode_virt(enum clock_event_mode mode,
+static int arch_timer_set_mode_virt(enum clock_event_mode mode,
    			     struct clock_event_device *clk)
 {
-	timer_set_mode(ARCH_TIMER_VIRT_ACCESS, mode, clk);
+	return timer_set_mode(ARCH_TIMER_VIRT_ACCESS, mode, clk);
 }
-static void arch_timer_set_mode_phys(enum clock_event_mode mode,
+static int arch_timer_set_mode_phys(enum clock_event_mode mode,
    			     struct clock_event_device *clk)
 {
-	timer_set_mode(ARCH_TIMER_PHYS_ACCESS, mode, clk);
+	return timer_set_mode(ARCH_TIMER_PHYS_ACCESS, mode, clk);
 }
-static void arch_timer_set_mode_virt_mem(enum clock_event_mode mode,
+static int arch_timer_set_mode_virt_mem(enum clock_event_mode mode,
    				 struct clock_event_device *clk)
 {
-	timer_set_mode(ARCH_TIMER_MEM_VIRT_ACCESS, mode, clk);
+	return timer_set_mode(ARCH_TIMER_MEM_VIRT_ACCESS, mode, clk);
 }
-static void arch_timer_set_mode_phys_mem(enum clock_event_mode mode,
+static int arch_timer_set_mode_phys_mem(enum clock_event_mode mode,
    				 struct clock_event_device *clk)
 {
-	timer_set_mode(ARCH_TIMER_MEM_PHYS_ACCESS, mode, clk);
+	return timer_set_mode(ARCH_TIMER_MEM_PHYS_ACCESS, mode, clk);
 }
static __always_inline void set_next_event(const int access, unsigned long evt,
@@ -271,11 +275,11 @@ static void __arch_timer_setup(unsigned type,
    	clk->cpumask = cpumask_of(smp_processor_id());
    	if (arch_timer_use_virtual) {
    		clk->irq = arch_timer_ppi[VIRT_PPI];
-			clk->set_mode = arch_timer_set_mode_virt;
+			clk->set_dev_mode = arch_timer_set_mode_virt;
    		clk->set_next_event = arch_timer_set_next_event_virt;
    	} else {
    		clk->irq = arch_timer_ppi[PHYS_SECURE_PPI];
-			clk->set_mode = arch_timer_set_mode_phys;
+			clk->set_dev_mode = arch_timer_set_mode_phys;
    		clk->set_next_event = arch_timer_set_next_event_phys;
    	}
    } else {
@@ -284,17 +288,17 @@ static void __arch_timer_setup(unsigned type,
    	clk->rating = 400;
    	clk->cpumask = cpu_all_mask;
    	if (arch_timer_mem_use_virtual) {
-			clk->set_mode = arch_timer_set_mode_virt_mem;
+			clk->set_dev_mode = arch_timer_set_mode_virt_mem;
    		clk->set_next_event =
    			arch_timer_set_next_event_virt_mem;
    	} else {
-			clk->set_mode = arch_timer_set_mode_phys_mem;
+			clk->set_dev_mode = arch_timer_set_mode_phys_mem;
    		clk->set_next_event =
    			arch_timer_set_next_event_phys_mem;
    	}
    }
-	clk->set_mode(CLOCK_EVT_MODE_SHUTDOWN, clk);
+	clk->set_dev_mode(CLOCK_EVT_MODE_SHUTDOWN, clk);
clockevents_config_and_register(clk, arch_timer_rate, 0xf, 0x7fffffff);
 }
@@ -457,7 +461,7 @@ static void arch_timer_stop(struct clock_event_device *clk)
    		disable_percpu_irq(arch_timer_ppi[PHYS_NONSECURE_PPI]);
    }
-	clk->set_mode(CLOCK_EVT_MODE_UNUSED, clk);
+	clk->set_dev_mode(CLOCK_EVT_MODE_UNUSED, clk);
 }
static int arch_timer_cpu_notify(struct notifier_block *self,
diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c
index 0fc31d0..937e039 100644
--- a/drivers/clocksource/arm_global_timer.c
+++ b/drivers/clocksource/arm_global_timer.c
@@ -107,7 +107,7 @@ static void gt_compare_set(unsigned long delta, int periodic)
    writel(ctrl, gt_base + GT_CONTROL);
 }
-static void gt_clockevent_set_mode(enum clock_event_mode mode,
+static int gt_clockevent_set_mode(enum clock_event_mode mode,
    			   struct clock_event_device *clk)
 {
    unsigned long ctrl;
@@ -124,9 +124,12 @@ static void gt_clockevent_set_mode(enum clock_event_mode mode,
    			GT_CONTROL_IRQ_ENABLE | GT_CONTROL_AUTO_INC);
    	writel(ctrl, gt_base + GT_CONTROL);
    	break;
-	default:
+	case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int gt_clockevent_set_next_event(unsigned long evt,
@@ -171,7 +174,7 @@ static int gt_clockevents_init(struct clock_event_device *clk)
    clk->name = "arm_global_timer";
    clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT |
    	CLOCK_EVT_FEAT_PERCPU;
-	clk->set_mode = gt_clockevent_set_mode;
+	clk->set_dev_mode = gt_clockevent_set_mode;
    clk->set_next_event = gt_clockevent_set_next_event;
    clk->cpumask = cpumask_of(cpu);
    clk->rating = 300;
diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c
index 26ed331..455b5dd 100644
--- a/drivers/clocksource/bcm2835_timer.c
+++ b/drivers/clocksource/bcm2835_timer.c
@@ -54,7 +54,7 @@ static u64 notrace bcm2835_sched_read(void)
    return readl_relaxed(system_clock);
 }
-static void bcm2835_time_set_mode(enum clock_event_mode mode,
+static int bcm2835_time_set_mode(enum clock_event_mode mode,
    struct clock_event_device *evt_dev)
 {
    switch (mode) {
@@ -64,9 +64,9 @@ static void bcm2835_time_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_RESUME:
    	break;
    default:
-		WARN(1, "%s: unhandled event mode %d\n", __func__, mode);
-		break;
+		return -ENOSYS;
    }
+	return 0;
 }
static int bcm2835_time_set_next_event(unsigned long event,
@@ -129,7 +129,7 @@ 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_dev_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;
diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
index 0595dc6..a3899f4 100644
--- a/drivers/clocksource/bcm_kona_timer.c
+++ b/drivers/clocksource/bcm_kona_timer.c
@@ -128,7 +128,7 @@ static int kona_timer_set_next_event(unsigned long clc,
    return 0;
 }
-static void kona_timer_set_mode(enum clock_event_mode mode,
+static int kona_timer_set_mode(enum clock_event_mode mode,
    		     struct clock_event_device *unused)
 {
    switch (mode) {
@@ -137,16 +137,20 @@ static void kona_timer_set_mode(enum clock_event_mode mode,
    	break;
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_SHUTDOWN:
-	default:
+	case CLOCK_EVT_MODE_RESUME:
    	kona_timer_disable_and_clear(timers.tmr_regs);
+		break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static struct clock_event_device kona_clockevent_timer = {
    .name = "timer 1",
    .features = CLOCK_EVT_FEAT_ONESHOT,
    .set_next_event = kona_timer_set_next_event,
-	.set_mode = kona_timer_set_mode
+	.set_dev_mode = kona_timer_set_mode
 };
static void __init kona_timer_clockevents_init(void)
diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c
index 49fbe28..3d355ec 100644
--- a/drivers/clocksource/cadence_ttc_timer.c
+++ b/drivers/clocksource/cadence_ttc_timer.c
@@ -196,7 +196,7 @@ static int ttc_set_next_event(unsigned long cycles,
  * @mode:	Mode to be set
  * @evt:	Address of clock event instance
  **/
-static void ttc_set_mode(enum clock_event_mode mode,
+static int ttc_set_mode(enum clock_event_mode mode,
    				struct clock_event_device *evt)
 {
    struct ttc_timer_clockevent *ttce = to_ttc_timer_clkevent(evt);
@@ -224,7 +224,10 @@ static void ttc_set_mode(enum clock_event_mode mode,
    	__raw_writel(ctrl_reg,
    			timer->base_addr + TTC_CNT_CNTRL_OFFSET);
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int ttc_rate_change_clocksource_cb(struct notifier_block *nb,
@@ -428,7 +431,7 @@ static void __init ttc_setup_clockevent(struct clk *clk,
    ttcce->ce.name = "ttc_clockevent";
    ttcce->ce.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
    ttcce->ce.set_next_event = ttc_set_next_event;
-	ttcce->ce.set_mode = ttc_set_mode;
+	ttcce->ce.set_dev_mode = ttc_set_mode;
    ttcce->ce.rating = 200;
    ttcce->ce.irq = irq;
    ttcce->ce.cpumask = cpu_possible_mask;
diff --git a/drivers/clocksource/cs5535-clockevt.c b/drivers/clocksource/cs5535-clockevt.c
index db21052..c1b1f7f 100644
--- a/drivers/clocksource/cs5535-clockevt.c
+++ b/drivers/clocksource/cs5535-clockevt.c
@@ -77,15 +77,26 @@ static void start_timer(struct cs5535_mfgpt_timer *timer, uint16_t delta)
    		MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
 }
-static void mfgpt_set_mode(enum clock_event_mode mode,
+static int mfgpt_set_mode(enum clock_event_mode mode,
    	struct clock_event_device *evt)
 {
    disable_timer(cs5535_event_clock);
-	if (mode == CLOCK_EVT_MODE_PERIODIC)
+	switch (mode) {
+	case CLOCK_EVT_MODE_PERIODIC:
    	start_timer(cs5535_event_clock, MFGPT_PERIODIC);
+		break;
+	case CLOCK_EVT_MODE_ONESHOT:
+	case CLOCK_EVT_MODE_UNUSED:
+	case CLOCK_EVT_MODE_SHUTDOWN:
+	case CLOCK_EVT_MODE_RESUME:
+		break;
+	default:
+		return -ENOSYS;
+	}
cs5535_tick_mode = mode;
+	return 0;
 }
static int mfgpt_next_event(unsigned long delta, struct clock_event_device *evt)
@@ -97,7 +108,7 @@ static int mfgpt_next_event(unsigned long delta, struct clock_event_device *evt)
 static struct clock_event_device cs5535_clockevent = {
    .name = DRV_NAME,
    .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-	.set_mode = mfgpt_set_mode,
+	.set_dev_mode = mfgpt_set_mode,
    .set_next_event = mfgpt_next_event,
    .rating = 250,
 };
diff --git a/drivers/clocksource/dummy_timer.c b/drivers/clocksource/dummy_timer.c
index ad35725..2d0cc09 100644
--- a/drivers/clocksource/dummy_timer.c
+++ b/drivers/clocksource/dummy_timer.c
@@ -16,13 +16,24 @@
static DEFINE_PER_CPU(struct clock_event_device, dummy_timer_evt);
-static void dummy_timer_set_mode(enum clock_event_mode mode,
+static int dummy_timer_set_mode(enum clock_event_mode mode,
    		   struct clock_event_device *evt)
 {
+	switch (mode) {
+	case CLOCK_EVT_MODE_PERIODIC:
+	case CLOCK_EVT_MODE_ONESHOT:
+	case CLOCK_EVT_MODE_UNUSED:
+	case CLOCK_EVT_MODE_SHUTDOWN:
+	case CLOCK_EVT_MODE_RESUME:
    /*
     * Core clockevents code will call this when exchanging timer devices.
     * We don't need to do anything here.
     */
+		break;
+	default:
+		return -ENOSYS;
+	}
+	return 0;
 }
static void dummy_timer_setup(void)
@@ -35,7 +46,7 @@ static void dummy_timer_setup(void)
    		  CLOCK_EVT_FEAT_ONESHOT |
    		  CLOCK_EVT_FEAT_DUMMY;
    evt->rating	= 100;
-	evt->set_mode	= dummy_timer_set_mode;
+	evt->set_dev_mode	= dummy_timer_set_mode;
    evt->cpumask	= cpumask_of(cpu);
clockevents_register_device(evt);
diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c
index f3656a6b..15ac39c 100644
--- a/drivers/clocksource/dw_apb_timer.c
+++ b/drivers/clocksource/dw_apb_timer.c
@@ -110,7 +110,7 @@ static void apbt_enable_int(struct dw_apb_timer *timer)
    apbt_writel(timer, ctrl, APBTMR_N_CONTROL);
 }
-static void apbt_set_mode(enum clock_event_mode mode,
+static int apbt_set_mode(enum clock_event_mode mode,
    		  struct clock_event_device *evt)
 {
    unsigned long ctrl;
@@ -173,7 +173,10 @@ static void apbt_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_RESUME:
    	apbt_enable_int(&dw_ced->timer);
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int apbt_next_event(unsigned long delta,
@@ -232,7 +235,7 @@ dw_apb_clockevent_init(int cpu, const char *name, unsigned rating,
    dw_ced->ced.min_delta_ns = clockevent_delta2ns(5000, &dw_ced->ced);
    dw_ced->ced.cpumask = cpumask_of(cpu);
    dw_ced->ced.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
-	dw_ced->ced.set_mode = apbt_set_mode;
+	dw_ced->ced.set_dev_mode = apbt_set_mode;
    dw_ced->ced.set_next_event = apbt_next_event;
    dw_ced->ced.irq = dw_ced->timer.irq;
    dw_ced->ced.rating = rating;
diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c
index 9d17083..34b9a01 100644
--- a/drivers/clocksource/em_sti.c
+++ b/drivers/clocksource/em_sti.c
@@ -251,7 +251,7 @@ static struct em_sti_priv *ced_to_em_sti(struct clock_event_device *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_mode(enum clock_event_mode mode,
    			    struct clock_event_device *ced)
 {
    struct em_sti_priv *p = ced_to_em_sti(ced);
@@ -275,9 +275,12 @@ static void em_sti_clock_event_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_UNUSED:
    	em_sti_stop(p, USER_CLOCKEVENT);
    	break;
-	default:
+	case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int em_sti_clock_event_next(unsigned long delta,
@@ -303,11 +306,11 @@ static void em_sti_register_clockevent(struct em_sti_priv *p)
    ced->rating = 200;
    ced->cpumask = cpu_possible_mask;
    ced->set_next_event = em_sti_clock_event_next;
-	ced->set_mode = em_sti_clock_event_mode;
+	ced->set_dev_mode = em_sti_clock_event_mode;
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_dev_mode() */
    clockevents_config_and_register(ced, 1, 2, 0xffffffff);
 }
diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c
index acf5a32..f4c70d3 100644
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
@@ -242,7 +242,7 @@ static int exynos4_comp_set_next_event(unsigned long cycles,
    return 0;
 }
-static void exynos4_comp_set_mode(enum clock_event_mode mode,
+static int exynos4_comp_set_mode(enum clock_event_mode mode,
    			  struct clock_event_device *evt)
 {
    unsigned long cycles_per_jiffy;
@@ -260,7 +260,10 @@ static void exynos4_comp_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_SHUTDOWN:
    case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static struct clock_event_device mct_comp_device = {
@@ -268,7 +271,7 @@ static struct clock_event_device mct_comp_device = {
    .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
    .rating		= 250,
    .set_next_event	= exynos4_comp_set_next_event,
-	.set_mode	= exynos4_comp_set_mode,
+	.set_dev_mode	= exynos4_comp_set_mode,
 };
static irqreturn_t exynos4_mct_comp_isr(int irq, void *dev_id)
@@ -344,7 +347,7 @@ static int exynos4_tick_set_next_event(unsigned long cycles,
    return 0;
 }
-static inline void exynos4_tick_set_mode(enum clock_event_mode mode,
+static inline int exynos4_tick_set_mode(enum clock_event_mode mode,
    				 struct clock_event_device *evt)
 {
    struct mct_clock_event_device *mevt = this_cpu_ptr(&percpu_mct_tick);
@@ -364,7 +367,10 @@ static inline void exynos4_tick_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_SHUTDOWN:
    case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int exynos4_mct_tick_clear(struct mct_clock_event_device *mevt)
@@ -413,7 +419,7 @@ static int exynos4_local_timer_setup(struct clock_event_device *evt)
    evt->name = mevt->name;
    evt->cpumask = cpumask_of(cpu);
    evt->set_next_event = exynos4_tick_set_next_event;
-	evt->set_mode = exynos4_tick_set_mode;
+	evt->set_dev_mode = exynos4_tick_set_mode;
    evt->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
    evt->rating = 450;
@@ -440,7 +446,7 @@ static int exynos4_local_timer_setup(struct clock_event_device *evt)
static void exynos4_local_timer_stop(struct clock_event_device *evt)
 {
-	evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
+	evt->set_dev_mode(CLOCK_EVT_MODE_UNUSED, evt);
    if (mct_int_type == MCT_INT_SPI)
    	free_irq(evt->irq, this_cpu_ptr(&percpu_mct_tick));
    else
diff --git a/drivers/clocksource/i8253.c b/drivers/clocksource/i8253.c
index 14ee3ef..936da9c 100644
--- a/drivers/clocksource/i8253.c
+++ b/drivers/clocksource/i8253.c
@@ -105,7 +105,7 @@ int __init clocksource_i8253_init(void)
  *
  * This is also called after resume to bring the PIT into operation again.
  */
-static void init_pit_timer(enum clock_event_mode mode,
+static int init_pit_timer(enum clock_event_mode mode,
    		   struct clock_event_device *evt)
 {
    raw_spin_lock(&i8253_lock);
@@ -136,8 +136,12 @@ static void init_pit_timer(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_RESUME:
    	/* Nothing to do here */
    	break;
+	default:
+		raw_spin_unlock(&i8253_lock);
+		return -ENOSYS;
    }
    raw_spin_unlock(&i8253_lock);
+	return 0;
 }
/*
@@ -162,7 +166,7 @@ static int pit_next_event(unsigned long delta, struct clock_event_device *evt)
 struct clock_event_device i8253_clockevent = {
    .name		= "pit",
    .features	= CLOCK_EVT_FEAT_PERIODIC,
-	.set_mode	= init_pit_timer,
+	.set_dev_mode	= init_pit_timer,
    .set_next_event = pit_next_event,
 };
diff --git a/drivers/clocksource/metag_generic.c b/drivers/clocksource/metag_generic.c
index 9e4db41..501fff4 100644
--- a/drivers/clocksource/metag_generic.c
+++ b/drivers/clocksource/metag_generic.c
@@ -56,7 +56,7 @@ static int metag_timer_set_next_event(unsigned long delta,
    return 0;
 }
-static void metag_timer_set_mode(enum clock_event_mode mode,
+static int metag_timer_set_mode(enum clock_event_mode mode,
    			 struct clock_event_device *evt)
 {
    switch (mode) {
@@ -68,11 +68,10 @@ static void metag_timer_set_mode(enum clock_event_mode mode,
    	/* We should disable the IRQ here */
    	break;
-	case CLOCK_EVT_MODE_PERIODIC:
-	case CLOCK_EVT_MODE_UNUSED:
-		WARN_ON(1);
-		break;
+	default:
+		return -ENOSYS;
    };
+	return 0;
 }
static cycle_t metag_clocksource_read(struct clocksource *cs)
@@ -129,7 +128,7 @@ static void arch_timer_setup(unsigned int cpu)
    clk->rating = 200,
    clk->shift = 12,
    clk->irq = tbisig_map(TBID_SIGNUM_TRT),
-	clk->set_mode = metag_timer_set_mode,
+	clk->set_dev_mode = metag_timer_set_mode,
    clk->set_next_event = metag_timer_set_next_event,
clk->mult = div_sc(hwtimer_freq, NSEC_PER_SEC, clk->shift);
diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c
index 5eb2c35..edae259 100644
--- a/drivers/clocksource/moxart_timer.c
+++ b/drivers/clocksource/moxart_timer.c
@@ -58,7 +58,7 @@
 static void __iomem *base;
 static unsigned int clock_count_per_tick;
-static void moxart_clkevt_mode(enum clock_event_mode mode,
+static int moxart_clkevt_mode(enum clock_event_mode mode,
    		       struct clock_event_device *clk)
 {
    switch (mode) {
@@ -73,10 +73,12 @@ static void moxart_clkevt_mode(enum clock_event_mode mode,
    	break;
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_SHUTDOWN:
-	default:
    	writel(TIMER1_DISABLE, base + TIMER_CR);
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int moxart_clkevt_next_event(unsigned long cycles,
@@ -98,7 +100,7 @@ static struct clock_event_device moxart_clockevent = {
    .name		= "moxart_timer",
    .rating		= 200,
    .features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-	.set_mode	= moxart_clkevt_mode,
+	.set_dev_mode	= moxart_clkevt_mode,
    .set_next_event	= moxart_clkevt_next_event,
 };
diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c
index 445b68a..6de37bf 100644
--- a/drivers/clocksource/mxs_timer.c
+++ b/drivers/clocksource/mxs_timer.c
@@ -150,7 +150,7 @@ static const char *clock_event_mode_label[] const = {
 };
 #endif /* DEBUG */
-static void mxs_set_mode(enum clock_event_mode mode,
+static int mxs_set_mode(enum clock_event_mode mode,
    			struct clock_event_device *evt)
 {
    /* Disable interrupt in timer module */
@@ -179,9 +179,6 @@ static void mxs_set_mode(enum clock_event_mode mode,
    mxs_clockevent_mode = mode;
switch (mode) {
-	case CLOCK_EVT_MODE_PERIODIC:
-		pr_err("%s: Periodic mode is not implemented\n", __func__);
-		break;
    case CLOCK_EVT_MODE_ONESHOT:
    	timrot_irq_enable();
    	break;
@@ -190,13 +187,16 @@ static void mxs_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_RESUME:
    	/* Left event sources disabled, no more interrupts appear */
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static struct clock_event_device mxs_clockevent_device = {
    .name		= "mxs_timrot",
    .features	= CLOCK_EVT_FEAT_ONESHOT,
-	.set_mode	= mxs_set_mode,
+	.set_dev_mode	= mxs_set_mode,
    .set_next_event	= timrotv2_set_next_event,
    .rating		= 200,
 };
diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c
index a709cfa..8c3d355 100644
--- a/drivers/clocksource/nomadik-mtu.c
+++ b/drivers/clocksource/nomadik-mtu.c
@@ -119,7 +119,7 @@ static void nmdk_clkevt_reset(void)
    }
 }
-static void nmdk_clkevt_mode(enum clock_event_mode mode,
+static int nmdk_clkevt_mode(enum clock_event_mode mode,
    		     struct clock_event_device *dev)
 {
    switch (mode) {
@@ -140,7 +140,10 @@ static void nmdk_clkevt_mode(enum clock_event_mode mode,
    	break;
    case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static void nmdk_clksrc_reset(void)
@@ -167,7 +170,7 @@ static struct clock_event_device nmdk_clkevt = {
    .features	= CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC |
                      CLOCK_EVT_FEAT_DYNIRQ,
    .rating		= 200,
-	.set_mode	= nmdk_clkevt_mode,
+	.set_dev_mode	= nmdk_clkevt_mode,
    .set_next_event	= nmdk_clkevt_next,
    .resume		= nmdk_clkevt_resume,
 };
diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c
index e807acf..f72ef19 100644
--- a/drivers/clocksource/qcom-timer.c
+++ b/drivers/clocksource/qcom-timer.c
@@ -75,7 +75,7 @@ static int msm_timer_set_next_event(unsigned long cycles,
    return 0;
 }
-static void msm_timer_set_mode(enum clock_event_mode mode,
+static int msm_timer_set_mode(enum clock_event_mode mode,
    		      struct clock_event_device *evt)
 {
    u32 ctrl;
@@ -85,16 +85,17 @@ static void msm_timer_set_mode(enum clock_event_mode mode,
switch (mode) {
    case CLOCK_EVT_MODE_RESUME:
-	case CLOCK_EVT_MODE_PERIODIC:
-		break;
    case CLOCK_EVT_MODE_ONESHOT:
    	/* Timer is enabled in set_next_event */
    	break;
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_SHUTDOWN:
    	break;
+	default:
+		return -ENOSYS;
    }
    writel_relaxed(ctrl, event_base + TIMER_ENABLE);
+	return 0;
 }
static struct clock_event_device __percpu *msm_evt;
@@ -126,7 +127,7 @@ static int msm_local_timer_setup(struct clock_event_device *evt)
    evt->name = "msm_timer";
    evt->features = CLOCK_EVT_FEAT_ONESHOT;
    evt->rating = 200;
-	evt->set_mode = msm_timer_set_mode;
+	evt->set_dev_mode = msm_timer_set_mode;
    evt->set_next_event = msm_timer_set_next_event;
    evt->cpumask = cpumask_of(cpu);
@@ -147,7 +148,7 @@ static int msm_local_timer_setup(struct clock_event_device *evt)
static void msm_local_timer_stop(struct clock_event_device *evt)
 {
-	evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
+	evt->set_dev_mode(CLOCK_EVT_MODE_UNUSED, evt);
    disable_percpu_irq(evt->irq);
 }
diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c
index 5645cfc..4ce11bf 100644
--- a/drivers/clocksource/samsung_pwm_timer.c
+++ b/drivers/clocksource/samsung_pwm_timer.c
@@ -207,7 +207,7 @@ static int samsung_set_next_event(unsigned long cycles,
    return 0;
 }
-static void samsung_set_mode(enum clock_event_mode mode,
+static int samsung_set_mode(enum clock_event_mode mode,
    			struct clock_event_device *evt)
 {
    samsung_time_stop(pwm.event_id);
@@ -225,7 +225,10 @@ static void samsung_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_SHUTDOWN:
    case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static void samsung_clockevent_resume(struct clock_event_device *cev)
@@ -244,7 +247,7 @@ static struct clock_event_device time_event_device = {
    .features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
    .rating		= 200,
    .set_next_event	= samsung_set_next_event,
-	.set_mode	= samsung_set_mode,
+	.set_dev_mode	= samsung_set_mode,
    .resume		= samsung_clockevent_resume,
 };
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 0b1836a..ed4e5d0 100644
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -585,7 +585,7 @@ static void sh_cmt_clock_event_start(struct sh_cmt_priv *p, int periodic)
    	sh_cmt_set_next(p, p->max_match_value);
 }
-static void sh_cmt_clock_event_mode(enum clock_event_mode mode,
+static int sh_cmt_clock_event_mode(enum clock_event_mode mode,
    			    struct clock_event_device *ced)
 {
    struct sh_cmt_priv *p = ced_to_sh_cmt(ced);
@@ -613,9 +613,12 @@ static void sh_cmt_clock_event_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_UNUSED:
    	sh_cmt_stop(p, FLAG_CLOCKEVENT);
    	break;
-	default:
+	case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int sh_cmt_clock_event_next(unsigned long delta,
@@ -661,7 +664,7 @@ static void sh_cmt_register_clockevent(struct sh_cmt_priv *p,
    ced->rating = rating;
    ced->cpumask = cpumask_of(0);
    ced->set_next_event = sh_cmt_clock_event_next;
-	ced->set_mode = sh_cmt_clock_event_mode;
+	ced->set_dev_mode = sh_cmt_clock_event_mode;
    ced->suspend = sh_cmt_clock_event_suspend;
    ced->resume = sh_cmt_clock_event_resume;
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c
index e30d76e..3d51350 100644
--- a/drivers/clocksource/sh_mtu2.c
+++ b/drivers/clocksource/sh_mtu2.c
@@ -184,7 +184,7 @@ static struct sh_mtu2_priv *ced_to_sh_mtu2(struct clock_event_device *ced)
    return container_of(ced, struct sh_mtu2_priv, ced);
 }
-static void sh_mtu2_clock_event_mode(enum clock_event_mode mode,
+static int sh_mtu2_clock_event_mode(enum clock_event_mode mode,
    			    struct clock_event_device *ced)
 {
    struct sh_mtu2_priv *p = ced_to_sh_mtu2(ced);
@@ -210,9 +210,12 @@ static void sh_mtu2_clock_event_mode(enum clock_event_mode mode,
    		sh_mtu2_disable(p);
    	break;
    case CLOCK_EVT_MODE_SHUTDOWN:
-	default:
+	case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static void sh_mtu2_clock_event_suspend(struct clock_event_device *ced)
@@ -237,7 +240,7 @@ static void sh_mtu2_register_clockevent(struct sh_mtu2_priv *p,
    ced->features = CLOCK_EVT_FEAT_PERIODIC;
    ced->rating = rating;
    ced->cpumask = cpumask_of(0);
-	ced->set_mode = sh_mtu2_clock_event_mode;
+	ced->set_dev_mode = sh_mtu2_clock_event_mode;
    ced->suspend = sh_mtu2_clock_event_suspend;
    ced->resume = sh_mtu2_clock_event_resume;
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index ecd7b60..e8f9573 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -321,7 +321,7 @@ static void sh_tmu_clock_event_start(struct sh_tmu_priv *p, int periodic)
    }
 }
-static void sh_tmu_clock_event_mode(enum clock_event_mode mode,
+static int sh_tmu_clock_event_mode(enum clock_event_mode mode,
    			    struct clock_event_device *ced)
 {
    struct sh_tmu_priv *p = ced_to_sh_tmu(ced);
@@ -352,9 +352,12 @@ static void sh_tmu_clock_event_mode(enum clock_event_mode mode,
    		sh_tmu_disable(p);
    	break;
    case CLOCK_EVT_MODE_SHUTDOWN:
-	default:
+	case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int sh_tmu_clock_event_next(unsigned long delta,
@@ -393,7 +396,7 @@ static void sh_tmu_register_clockevent(struct sh_tmu_priv *p,
    ced->rating = rating;
    ced->cpumask = cpumask_of(0);
    ced->set_next_event = sh_tmu_clock_event_next;
-	ced->set_mode = sh_tmu_clock_event_mode;
+	ced->set_dev_mode = sh_tmu_clock_event_mode;
    ced->suspend = sh_tmu_clock_event_suspend;
    ced->resume = sh_tmu_clock_event_resume;
diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c
index efb17c3..b755fcb 100644
--- a/drivers/clocksource/sun4i_timer.c
+++ b/drivers/clocksource/sun4i_timer.c
@@ -81,7 +81,7 @@ static void sun4i_clkevt_time_start(u8 timer, bool periodic)
           timer_base + TIMER_CTL_REG(timer));
 }
-static void sun4i_clkevt_mode(enum clock_event_mode mode,
+static int sun4i_clkevt_mode(enum clock_event_mode mode,
    		      struct clock_event_device *clk)
 {
    switch (mode) {
@@ -96,10 +96,13 @@ static void sun4i_clkevt_mode(enum clock_event_mode mode,
    	break;
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_SHUTDOWN:
-	default:
+	case CLOCK_EVT_MODE_RESUME:
    	sun4i_clkevt_time_stop(0);
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int sun4i_clkevt_next_event(unsigned long evt,
@@ -116,7 +119,7 @@ static struct clock_event_device sun4i_clockevent = {
    .name = "sun4i_tick",
    .rating = 350,
    .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-	.set_mode = sun4i_clkevt_mode,
+	.set_dev_mode = sun4i_clkevt_mode,
    .set_next_event = sun4i_clkevt_next_event,
 };
diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
index 00fdd11..b6b23f1 100644
--- a/drivers/clocksource/tcb_clksrc.c
+++ b/drivers/clocksource/tcb_clksrc.c
@@ -91,7 +91,7 @@ static struct tc_clkevt_device *to_tc_clkevt(struct clock_event_device *clkevt)
  */
 static u32 timer_clock;
-static void tc_mode(enum clock_event_mode m, struct clock_event_device *d)
+static int tc_mode(enum clock_event_mode m, struct clock_event_device *d)
 {
    struct tc_clkevt_device *tcd = to_tc_clkevt(d);
    void __iomem		*regs = tcd->regs;
@@ -137,9 +137,14 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d)
    	/* set_next_event() configures and starts the timer */
    	break;
-	default:
+	case CLOCK_EVT_MODE_UNUSED:
+	case CLOCK_EVT_MODE_SHUTDOWN:
+	case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int tc_next_event(unsigned long delta, struct clock_event_device *d)
@@ -160,7 +165,7 @@ static struct tc_clkevt_device clkevt = {
    	/* Should be lower than at91rm9200's system timer */
    	.rating		= 125,
    	.set_next_event	= tc_next_event,
-		.set_mode	= tc_mode,
+		.set_dev_mode	= tc_mode,
    },
 };
diff --git a/drivers/clocksource/tegra20_timer.c b/drivers/clocksource/tegra20_timer.c
index d1869f0..aa0d3e9 100644
--- a/drivers/clocksource/tegra20_timer.c
+++ b/drivers/clocksource/tegra20_timer.c
@@ -69,7 +69,7 @@ static int tegra_timer_set_next_event(unsigned long cycles,
    return 0;
 }
-static void tegra_timer_set_mode(enum clock_event_mode mode,
+static int tegra_timer_set_mode(enum clock_event_mode mode,
    			    struct clock_event_device *evt)
 {
    u32 reg;
@@ -87,7 +87,10 @@ static void tegra_timer_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_SHUTDOWN:
    case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static struct clock_event_device tegra_clockevent = {
@@ -95,7 +98,7 @@ static struct clock_event_device tegra_clockevent = {
    .rating		= 300,
    .features	= CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC,
    .set_next_event	= tegra_timer_set_next_event,
-	.set_mode	= tegra_timer_set_mode,
+	.set_dev_mode	= tegra_timer_set_mode,
 };
static u64 notrace tegra_read_sched_clock(void)
diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index 0451e62..8aa35c1 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -120,12 +120,12 @@ armada_370_xp_clkevt_next_event(unsigned long delta,
    return 0;
 }
-static void
+static int
 armada_370_xp_clkevt_mode(enum clock_event_mode mode,
    		  struct clock_event_device *dev)
 {
-	if (mode == CLOCK_EVT_MODE_PERIODIC) {
-
+	switch (mode) {
+	case CLOCK_EVT_MODE_PERIODIC:
    	/*
    	 * Setup timer to fire at 1/HZ intervals.
    	 */
@@ -136,7 +136,11 @@ armada_370_xp_clkevt_mode(enum clock_event_mode mode,
    	 * Enable timer.
    	 */
    	local_timer_ctrl_clrset(0, TIMER0_RELOAD_EN | enable_mask);
-	} else {
+		break;
+	case CLOCK_EVT_MODE_ONESHOT:
+	case CLOCK_EVT_MODE_UNUSED:
+	case CLOCK_EVT_MODE_SHUTDOWN:
+	case CLOCK_EVT_MODE_RESUME:
    	/*
    	 * Disable timer.
    	 */
@@ -146,7 +150,11 @@ armada_370_xp_clkevt_mode(enum clock_event_mode mode,
    	 * ACK pending timer interrupt.
    	 */
    	writel(TIMER0_CLR_MASK, local_base + LCL_TIMER_EVENTS_STATUS);
+		break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int armada_370_xp_clkevt_irq;
@@ -184,7 +192,7 @@ static int armada_370_xp_timer_setup(struct clock_event_device *evt)
    evt->shift		= 32,
    evt->rating		= 300,
    evt->set_next_event	= armada_370_xp_clkevt_next_event,
-	evt->set_mode		= armada_370_xp_clkevt_mode,
+	evt->set_dev_mode	= armada_370_xp_clkevt_mode,
    evt->irq		= armada_370_xp_clkevt_irq;
    evt->cpumask		= cpumask_of(cpu);
@@ -196,7 +204,7 @@ static int armada_370_xp_timer_setup(struct clock_event_device *evt)
static void armada_370_xp_timer_stop(struct clock_event_device *evt)
 {
-	evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
+	evt->set_dev_mode(CLOCK_EVT_MODE_UNUSED, evt);
    disable_percpu_irq(evt->irq);
 }
diff --git a/drivers/clocksource/time-efm32.c b/drivers/clocksource/time-efm32.c
index 1a6205b..6e5af98 100644
--- a/drivers/clocksource/time-efm32.c
+++ b/drivers/clocksource/time-efm32.c
@@ -48,7 +48,7 @@ struct efm32_clock_event_ddata {
    unsigned periodic_top;
 };
-static void efm32_clock_event_set_mode(enum clock_event_mode mode,
+static int efm32_clock_event_set_mode(enum clock_event_mode mode,
    			       struct clock_event_device *evtdev)
 {
    struct efm32_clock_event_ddata *ddata =
@@ -81,7 +81,10 @@ static void efm32_clock_event_set_mode(enum clock_event_mode mode,
case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int efm32_clock_event_set_next_event(unsigned long evt,
@@ -112,7 +115,7 @@ static struct efm32_clock_event_ddata clock_event_ddata = {
    .evtdev = {
    	.name = "efm32 clockevent",
    	.features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_MODE_PERIODIC,
-		.set_mode = efm32_clock_event_set_mode,
+		.set_dev_mode = efm32_clock_event_set_mode,
    	.set_next_event = efm32_clock_event_set_next_event,
    	.rating = 200,
    },
diff --git a/drivers/clocksource/time-orion.c b/drivers/clocksource/time-orion.c
index 0b3ce03..3a26ce9 100644
--- a/drivers/clocksource/time-orion.c
+++ b/drivers/clocksource/time-orion.c
@@ -60,21 +60,30 @@ static int orion_clkevt_next_event(unsigned long delta,
    return 0;
 }
-static void orion_clkevt_mode(enum clock_event_mode mode,
+static int orion_clkevt_mode(enum clock_event_mode mode,
    		      struct clock_event_device *dev)
 {
-	if (mode == CLOCK_EVT_MODE_PERIODIC) {
+	switch (mode) {
+	case CLOCK_EVT_MODE_PERIODIC:
    	/* setup and enable periodic timer at 1/HZ intervals */
    	writel(ticks_per_jiffy - 1, timer_base + TIMER1_RELOAD);
    	writel(ticks_per_jiffy - 1, timer_base + TIMER1_VAL);
    	atomic_io_modify(timer_base + TIMER_CTRL,
    		TIMER1_RELOAD_EN | TIMER1_EN,
    		TIMER1_RELOAD_EN | TIMER1_EN);
-	} else {
+		break;
+	case CLOCK_EVT_MODE_ONESHOT:
+	case CLOCK_EVT_MODE_UNUSED:
+	case CLOCK_EVT_MODE_SHUTDOWN:
+	case CLOCK_EVT_MODE_RESUME:
    	/* disable timer */
    	atomic_io_modify(timer_base + TIMER_CTRL,
    		TIMER1_RELOAD_EN | TIMER1_EN, 0);
+		break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static struct clock_event_device orion_clkevt = {
@@ -83,7 +92,7 @@ static struct clock_event_device orion_clkevt = {
    .shift		= 32,
    .rating		= 300,
    .set_next_event	= orion_clkevt_next_event,
-	.set_mode	= orion_clkevt_mode,
+	.set_dev_mode	= orion_clkevt_mode,
 };
static irqreturn_t orion_clkevt_irq_handler(int irq, void *dev_id)
diff --git a/drivers/clocksource/timer-keystone.c b/drivers/clocksource/timer-keystone.c
index 0250354..722c7e3 100644
--- a/drivers/clocksource/timer-keystone.c
+++ b/drivers/clocksource/timer-keystone.c
@@ -141,7 +141,7 @@ static int keystone_set_next_event(unsigned long cycles,
    return keystone_timer_config(cycles, evt->mode);
 }
-static void keystone_set_mode(enum clock_event_mode mode,
+static int keystone_set_mode(enum clock_event_mode mode,
    		     struct clock_event_device *evt)
 {
    switch (mode) {
@@ -153,9 +153,12 @@ static void keystone_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_ONESHOT:
    	keystone_timer_disable();
    	break;
-	default:
+	case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static void __init keystone_timer_init(struct device_node *np)
@@ -222,7 +225,7 @@ static void __init keystone_timer_init(struct device_node *np)
    /* setup clockevent */
    event_dev->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
    event_dev->set_next_event = keystone_set_next_event;
-	event_dev->set_mode = keystone_set_mode;
+	event_dev->set_dev_mode = keystone_set_mode;
    event_dev->cpumask = cpu_all_mask;
    event_dev->owner = THIS_MODULE;
    event_dev->name = TIMER_NAME;
diff --git a/drivers/clocksource/timer-marco.c b/drivers/clocksource/timer-marco.c
index b52e1c0..4f202eb 100644
--- a/drivers/clocksource/timer-marco.c
+++ b/drivers/clocksource/timer-marco.c
@@ -114,18 +114,22 @@ static int sirfsoc_timer_set_next_event(unsigned long delta,
    return 0;
 }
-static void sirfsoc_timer_set_mode(enum clock_event_mode mode,
+static int sirfsoc_timer_set_mode(enum clock_event_mode mode,
    struct clock_event_device *ce)
 {
    switch (mode) {
    case CLOCK_EVT_MODE_ONESHOT:
    	/* enable in set_next_event */
+	case CLOCK_EVT_MODE_UNUSED:
+	case CLOCK_EVT_MODE_SHUTDOWN:
+	case CLOCK_EVT_MODE_RESUME:
    	break;
    default:
-		break;
+		return -ENOSYS;
    }
sirfsoc_timer_count_disable(smp_processor_id());
+	return 0;
 }
static void sirfsoc_clocksource_suspend(struct clocksource *cs)
@@ -190,7 +194,7 @@ static int sirfsoc_local_timer_setup(struct clock_event_device *ce)
    ce->name = "local_timer";
    ce->features = CLOCK_EVT_FEAT_ONESHOT;
    ce->rating = 200;
-	ce->set_mode = sirfsoc_timer_set_mode;
+	ce->set_dev_mode = sirfsoc_timer_set_mode;
    ce->set_next_event = sirfsoc_timer_set_next_event;
    clockevents_calc_mult_shift(ce, MARCO_CLOCK_FREQ, 60);
    ce->max_delta_ns = clockevent_delta2ns(-2, ce);
diff --git a/drivers/clocksource/timer-prima2.c b/drivers/clocksource/timer-prima2.c
index 1a6b2d6..0b49c10 100644
--- a/drivers/clocksource/timer-prima2.c
+++ b/drivers/clocksource/timer-prima2.c
@@ -99,14 +99,11 @@ static int sirfsoc_timer_set_next_event(unsigned long delta,
    return next - now > delta ? -ETIME : 0;
 }
-static void sirfsoc_timer_set_mode(enum clock_event_mode mode,
+static int sirfsoc_timer_set_mode(enum clock_event_mode mode,
    struct clock_event_device *ce)
 {
    u32 val = readl_relaxed(sirfsoc_timer_base + SIRFSOC_TIMER_INT_EN);
    switch (mode) {
-	case CLOCK_EVT_MODE_PERIODIC:
-		WARN_ON(1);
-		break;
    case CLOCK_EVT_MODE_ONESHOT:
    	writel_relaxed(val | BIT(0), sirfsoc_timer_base + SIRFSOC_TIMER_INT_EN);
    	break;
@@ -116,7 +113,10 @@ static void sirfsoc_timer_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static void sirfsoc_clocksource_suspend(struct clocksource *cs)
@@ -144,7 +144,7 @@ static struct clock_event_device sirfsoc_clockevent = {
    .name = "sirfsoc_clockevent",
    .rating = 200,
    .features = CLOCK_EVT_FEAT_ONESHOT,
-	.set_mode = sirfsoc_timer_set_mode,
+	.set_dev_mode = sirfsoc_timer_set_mode,
    .set_next_event = sirfsoc_timer_set_next_event,
 };
diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
index deebcd6..ce690f4 100644
--- a/drivers/clocksource/timer-sun5i.c
+++ b/drivers/clocksource/timer-sun5i.c
@@ -79,7 +79,7 @@ static void sun5i_clkevt_time_start(u8 timer, bool periodic)
           timer_base + TIMER_CTL_REG(timer));
 }
-static void sun5i_clkevt_mode(enum clock_event_mode mode,
+static int sun5i_clkevt_mode(enum clock_event_mode mode,
    		      struct clock_event_device *clk)
 {
    switch (mode) {
@@ -94,10 +94,14 @@ static void sun5i_clkevt_mode(enum clock_event_mode mode,
    	break;
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_SHUTDOWN:
-	default:
    	sun5i_clkevt_time_stop(0);
    	break;
+	case CLOCK_EVT_MODE_RESUME:
+		break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int sun5i_clkevt_next_event(unsigned long evt,
@@ -114,7 +118,7 @@ static struct clock_event_device sun5i_clockevent = {
    .name = "sun5i_tick",
    .rating = 340,
    .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-	.set_mode = sun5i_clkevt_mode,
+	.set_dev_mode = sun5i_clkevt_mode,
    .set_next_event = sun5i_clkevt_next_event,
 };
diff --git a/drivers/clocksource/timer-u300.c b/drivers/clocksource/timer-u300.c
index 5dcf756..000a865 100644
--- a/drivers/clocksource/timer-u300.c
+++ b/drivers/clocksource/timer-u300.c
@@ -192,7 +192,7 @@ struct u300_clockevent_data {
  * have oneshot timer active, the oneshot scheduling function
  * u300_set_next_event() is called immediately after.
  */
-static void u300_set_mode(enum clock_event_mode mode,
+static int u300_set_mode(enum clock_event_mode mode,
    		  struct clock_event_device *evt)
 {
    struct u300_clockevent_data *cevdata =
@@ -265,7 +265,10 @@ static void u300_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_RESUME:
    	/* Ignore this call */
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
/*
@@ -315,7 +318,7 @@ static struct u300_clockevent_data u300_clockevent_data = {
    	.features	= CLOCK_EVT_FEAT_PERIODIC |
    		CLOCK_EVT_FEAT_ONESHOT,
    	.set_next_event	= u300_set_next_event,
-		.set_mode	= u300_set_mode,
+		.set_dev_mode	= u300_set_mode,
    },
 };
diff --git a/drivers/clocksource/vf_pit_timer.c b/drivers/clocksource/vf_pit_timer.c
index a918bc4..a34e5c8 100644
--- a/drivers/clocksource/vf_pit_timer.c
+++ b/drivers/clocksource/vf_pit_timer.c
@@ -86,16 +86,22 @@ static int pit_set_next_event(unsigned long delta,
    return 0;
 }
-static void pit_set_mode(enum clock_event_mode mode,
+static int pit_set_mode(enum clock_event_mode mode,
    			struct clock_event_device *evt)
 {
    switch (mode) {
    case CLOCK_EVT_MODE_PERIODIC:
    	pit_set_next_event(cycle_per_jiffy, evt);
    	break;
-	default:
+	case CLOCK_EVT_MODE_ONESHOT:
+	case CLOCK_EVT_MODE_UNUSED:
+	case CLOCK_EVT_MODE_SHUTDOWN:
+	case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static irqreturn_t pit_timer_interrupt(int irq, void *dev_id)
@@ -121,7 +127,7 @@ static irqreturn_t pit_timer_interrupt(int irq, void *dev_id)
 static struct clock_event_device clockevent_pit = {
    .name		= "VF pit timer",
    .features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-	.set_mode	= pit_set_mode,
+	.set_dev_mode	= pit_set_mode,
    .set_next_event	= pit_set_next_event,
    .rating		= 300,
 };
diff --git a/drivers/clocksource/vt8500_timer.c b/drivers/clocksource/vt8500_timer.c
index 1098ed3..17492ed 100644
--- a/drivers/clocksource/vt8500_timer.c
+++ b/drivers/clocksource/vt8500_timer.c
@@ -88,12 +88,11 @@ static int vt8500_timer_set_next_event(unsigned long cycles,
    return 0;
 }
-static void vt8500_timer_set_mode(enum clock_event_mode mode,
+static int vt8500_timer_set_mode(enum clock_event_mode mode,
    		      struct clock_event_device *evt)
 {
    switch (mode) {
    case CLOCK_EVT_MODE_RESUME:
-	case CLOCK_EVT_MODE_PERIODIC:
    	break;
    case CLOCK_EVT_MODE_ONESHOT:
    case CLOCK_EVT_MODE_UNUSED:
@@ -102,7 +101,10 @@ static void vt8500_timer_set_mode(enum clock_event_mode mode,
    		regbase + TIMER_CTRL_VAL);
    	writel(0, regbase + TIMER_IER_VAL);
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static struct clock_event_device clockevent = {
@@ -110,7 +112,7 @@ static struct clock_event_device clockevent = {
    .features       = CLOCK_EVT_FEAT_ONESHOT,
    .rating         = 200,
    .set_next_event = vt8500_timer_set_next_event,
-	.set_mode       = vt8500_timer_set_mode,
+	.set_dev_mode	= vt8500_timer_set_mode,
 };
static irqreturn_t vt8500_timer_interrupt(int irq, void *dev_id)
diff --git a/drivers/clocksource/zevio-timer.c b/drivers/clocksource/zevio-timer.c
index 7ce4421..ce7246d 100644
--- a/drivers/clocksource/zevio-timer.c
+++ b/drivers/clocksource/zevio-timer.c
@@ -76,7 +76,7 @@ static int zevio_timer_set_event(unsigned long delta,
    return 0;
 }
-static void zevio_timer_set_mode(enum clock_event_mode mode,
+static int zevio_timer_set_mode(enum clock_event_mode mode,
    			 struct clock_event_device *dev)
 {
    struct zevio_timer *timer = container_of(dev, struct zevio_timer,
@@ -97,11 +97,10 @@ static void zevio_timer_set_mode(enum clock_event_mode mode,
    	/* Stop timer */
    	writel(CNTL_STOP_TIMER, timer->timer1 + IO_CONTROL);
    	break;
-	case CLOCK_EVT_MODE_PERIODIC:
    default:
-		/* Unsupported */
-		break;
+		return -ENOSYS;
    }
+	return 0;
 }
static irqreturn_t zevio_timer_interrupt(int irq, void *dev_id)
@@ -162,7 +161,7 @@ static int __init zevio_timer_add(struct device_node *node)
    if (timer->interrupt_regs && irqnr) {
    	timer->clkevt.name		= timer->clockevent_name;
    	timer->clkevt.set_next_event	= zevio_timer_set_event;
-		timer->clkevt.set_mode		= zevio_timer_set_mode;
+		timer->clkevt.set_dev_mode	= zevio_timer_set_mode;
    	timer->clkevt.rating		= 200;
    	timer->clkevt.cpumask		= cpu_all_mask;
    	timer->clkevt.features		= CLOCK_EVT_FEAT_ONESHOT;
-- 
2.0.0.rc2



    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[PATCH V3 6/8] clockevents: drivers/: migrate to ->set_dev_mode()