[PATCH V2 2/8] clockevents: arm: migrate to ->set_dev_mode()

22 May 2014

Clockevents core now supports ->set_dev_mode() (as a replacement to
->set_mode()), with capability to return error codes.
Migrate all ARM specific clockevent drivers 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() for unsupported modes. These statements
are removed now as proper error handling with a WARN_ON() is done at clockevents
core.
Also it is made sure that drivers don't disable events for unsupported modes.
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
---
 arch/arm/common/timer-sp.c               | 13 ++++++++-----
 arch/arm/kernel/smp_twd.c                | 10 +++++++---
 arch/arm/mach-at91/at91rm9200_time.c     | 10 ++++++++--
 arch/arm/mach-at91/at91sam926x_time.c    | 11 ++++++-----
 arch/arm/mach-clps711x/common.c          | 12 ++++++------
 arch/arm/mach-cns3xxx/core.c             | 10 +++++++---
 arch/arm/mach-davinci/time.c             |  7 +++++--
 arch/arm/mach-footbridge/dc21285-timer.c |  7 +++++--
 arch/arm/mach-gemini/time.c              |  7 ++++---
 arch/arm/mach-imx/epit.c                 | 20 ++++++++++++--------
 arch/arm/mach-imx/time.c                 | 20 ++++++++++++--------
 arch/arm/mach-integrator/integrator_ap.c | 16 ++++++++--------
 arch/arm/mach-ixp4xx/common.c            |  8 +++++---
 arch/arm/mach-ks8695/time.c              | 22 ++++++++++++++++------
 arch/arm/mach-lpc32xx/timer.c            | 11 +++++------
 arch/arm/mach-mmp/time.c                 | 12 +++++++-----
 arch/arm/mach-netx/time.c                | 16 +++++++---------
 arch/arm/mach-omap1/time.c               |  7 +++++--
 arch/arm/mach-omap1/timer32k.c           | 11 ++++++-----
 arch/arm/mach-omap2/timer.c              | 12 +++++++-----
 arch/arm/mach-pxa/time.c                 |  8 +++++---
 arch/arm/mach-sa1100/time.c              |  8 +++++---
 arch/arm/mach-spear/time.c               | 20 +++++++++++---------
 arch/arm/mach-w90x900/time.c             |  7 +++++--
 arch/arm/plat-iop/time.c                 |  8 +++++---
 arch/arm/plat-orion/time.c               | 20 +++++++++++++++-----
 26 files changed, 192 insertions(+), 121 deletions(-)

diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c
index fd6bff0..8831e9e 100644
--- a/arch/arm/common/timer-sp.c
+++ b/arch/arm/common/timer-sp.c
@@ -127,31 +127,34 @@ static irqreturn_t sp804_timer_interrupt(int irq, void *dev_id)
    return IRQ_HANDLED;
 }
-static void sp804_set_mode(enum clock_event_mode mode,
+static int sp804_set_mode(enum clock_event_mode mode,
    struct clock_event_device *evt)
 {
    unsigned long ctrl = TIMER_CTRL_32BIT | TIMER_CTRL_IE;
-	writel(ctrl, clkevt_base + TIMER_CTRL);
-
    switch (mode) {
    case CLOCK_EVT_MODE_PERIODIC:
+		writel(ctrl, clkevt_base + TIMER_CTRL);
    	writel(clkevt_reload, clkevt_base + TIMER_LOAD);
    	ctrl |= TIMER_CTRL_PERIODIC | TIMER_CTRL_ENABLE;
    	break;
case CLOCK_EVT_MODE_ONESHOT:
    	/* period set, and timer enabled in 'next_event' hook */
+		writel(ctrl, clkevt_base + TIMER_CTRL);
    	ctrl |= TIMER_CTRL_ONESHOT;
    	break;
case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_SHUTDOWN:
-	default:
+	case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
writel(ctrl, clkevt_base + TIMER_CTRL);
+	return 0;
 }
static int sp804_set_next_event(unsigned long next,
@@ -168,7 +171,7 @@ static int sp804_set_next_event(unsigned long next,
 static struct clock_event_device sp804_clockevent = {
    .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT |
    	CLOCK_EVT_FEAT_DYNIRQ,
-	.set_mode	= sp804_set_mode,
+	.set_dev_mode	= sp804_set_mode,
    .set_next_event	= sp804_set_next_event,
    .rating		= 300,
 };
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index dfc3213..f45420d 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -36,7 +36,7 @@ static DEFINE_PER_CPU(bool, percpu_setup_called);
 static struct clock_event_device __percpu *twd_evt;
 static int twd_ppi;
-static void twd_set_mode(enum clock_event_mode mode,
+static int twd_set_mode(enum clock_event_mode mode,
    		struct clock_event_device *clk)
 {
    unsigned long ctrl;
@@ -54,11 +54,15 @@ static void twd_set_mode(enum clock_event_mode mode,
    	break;
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_SHUTDOWN:
-	default:
+	case CLOCK_EVT_MODE_RESUME:
    	ctrl = 0;
+		break;
+	default:
+		return -ENOSYS;
    }
writel_relaxed(ctrl, twd_base + TWD_TIMER_CONTROL);
+	return 0;
 }
static int twd_set_next_event(unsigned long evt,
@@ -296,7 +300,7 @@ static void twd_timer_setup(void)
    clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT |
    		CLOCK_EVT_FEAT_C3STOP;
    clk->rating = 350;
-	clk->set_mode = twd_set_mode;
+	clk->set_dev_mode = twd_set_mode;
    clk->set_next_event = twd_set_next_event;
    clk->irq = twd_ppi;
    clk->cpumask = cpumask_of(cpu);
diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c
index 7fd13ae..c052038 100644
--- a/arch/arm/mach-at91/at91rm9200_time.c
+++ b/arch/arm/mach-at91/at91rm9200_time.c
@@ -112,9 +112,11 @@ static struct clocksource clk32k = {
    .flags		= CLOCK_SOURCE_IS_CONTINUOUS,
 };
-static void
+static int
 clkevt32k_mode(enum clock_event_mode mode, struct clock_event_device *dev)
 {
+	int ret = 0;
+
    /* Disable and flush pending timer interrupts */
    at91_st_write(AT91_ST_IDR, AT91_ST_PITS | AT91_ST_ALMS);
    at91_st_read(AT91_ST_SR);
@@ -138,8 +140,12 @@ clkevt32k_mode(enum clock_event_mode mode, struct clock_event_device *dev)
    case CLOCK_EVT_MODE_RESUME:
    	irqmask = 0;
    	break;
+	default:
+		/* irqmask retains value from last call */
+		ret = -ENOSYS;
    }
    at91_st_write(AT91_ST_IER, irqmask);
+	return ret;
 }
static int
@@ -177,7 +183,7 @@ static struct clock_event_device clkevt = {
    .features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
    .rating		= 150,
    .set_next_event	= clkevt32k_next_event,
-	.set_mode	= clkevt32k_mode,
+	.set_dev_mode	= clkevt32k_mode,
 };
void __iomem *at91_st_base;
diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c
index 0a9e2fc..9698eb6 100644
--- a/arch/arm/mach-at91/at91sam926x_time.c
+++ b/arch/arm/mach-at91/at91sam926x_time.c
@@ -83,7 +83,7 @@ static struct clocksource pit_clk = {
 /*
  * Clockevent device:  interrupts every 1/HZ (== pit_cycles * MCK/16)
  */
-static void
+static int
 pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev)
 {
    switch (mode) {
@@ -93,9 +93,6 @@ pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev)
    	pit_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN
    			| AT91_PIT_PITIEN);
    	break;
-	case CLOCK_EVT_MODE_ONESHOT:
-		BUG();
-		/* FALLTHROUGH */
    case CLOCK_EVT_MODE_SHUTDOWN:
    case CLOCK_EVT_MODE_UNUSED:
    	/* disable irq, leaving the clocksource active */
@@ -103,7 +100,11 @@ pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev)
    	break;
    case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+
+	return 0;
 }
static void at91sam926x_pit_suspend(struct clock_event_device *cedev)
@@ -135,7 +136,7 @@ static struct clock_event_device pit_clkevt = {
    .features	= CLOCK_EVT_FEAT_PERIODIC,
    .shift		= 32,
    .rating		= 100,
-	.set_mode	= pit_clkevt_mode,
+	.set_dev_mode	= pit_clkevt_mode,
    .suspend	= at91sam926x_pit_suspend,
    .resume		= at91sam926x_pit_resume,
 };
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c
index aee81fa..fa7c090 100644
--- a/arch/arm/mach-clps711x/common.c
+++ b/arch/arm/mach-clps711x/common.c
@@ -69,30 +69,30 @@ static u64 notrace clps711x_sched_clock_read(void)
    return ~readw_relaxed(CLPS711X_VIRT_BASE + TC1D);
 }
-static void clps711x_clockevent_set_mode(enum clock_event_mode mode,
+static int clps711x_clockevent_set_mode(enum clock_event_mode mode,
    				 struct clock_event_device *evt)
 {
-	disable_irq(IRQ_TC2OI);
-
    switch (mode) {
    case CLOCK_EVT_MODE_PERIODIC:
    	enable_irq(IRQ_TC2OI);
    	break;
-	case CLOCK_EVT_MODE_ONESHOT:
-		/* Not supported */
    case CLOCK_EVT_MODE_SHUTDOWN:
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_RESUME:
+		disable_irq(IRQ_TC2OI);
    	/* Left event sources disabled, no more interrupts appear */
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static struct clock_event_device clockevent_clps711x = {
    .name		= "clps711x-clockevent",
    .rating		= 300,
    .features	= CLOCK_EVT_FEAT_PERIODIC,
-	.set_mode	= clps711x_clockevent_set_mode,
+	.set_dev_mode	= clps711x_clockevent_set_mode,
 };
static irqreturn_t clps711x_timer_interrupt(int irq, void *dev_id)
diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c
index 2ae28a6..9746501 100644
--- a/arch/arm/mach-cns3xxx/core.c
+++ b/arch/arm/mach-cns3xxx/core.c
@@ -113,7 +113,7 @@ void cns3xxx_power_off(void)
  */
 static void __iomem *cns3xxx_tmr1;
-static void cns3xxx_timer_set_mode(enum clock_event_mode mode,
+static int cns3xxx_timer_set_mode(enum clock_event_mode mode,
    			   struct clock_event_device *clk)
 {
    unsigned long ctrl = readl(cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
@@ -132,11 +132,15 @@ static void cns3xxx_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:
    	ctrl = 0;
+		break;
+	default:
+		return -ENOSYS;
    }
writel(ctrl, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
+	return 0;
 }
static int cns3xxx_timer_set_next_event(unsigned long evt,
@@ -153,7 +157,7 @@ static int cns3xxx_timer_set_next_event(unsigned long evt,
 static struct clock_event_device cns3xxx_tmr1_clockevent = {
    .name		= "cns3xxx timer1",
    .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-	.set_mode	= cns3xxx_timer_set_mode,
+	.set_dev_mode	= cns3xxx_timer_set_mode,
    .set_next_event	= cns3xxx_timer_set_next_event,
    .rating		= 350,
    .cpumask	= cpu_all_mask,
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
index 24ad30f..7ab6a6c 100644
--- a/arch/arm/mach-davinci/time.c
+++ b/arch/arm/mach-davinci/time.c
@@ -303,7 +303,7 @@ static int davinci_set_next_event(unsigned long cycles,
    return 0;
 }
-static void davinci_set_mode(enum clock_event_mode mode,
+static int davinci_set_mode(enum clock_event_mode mode,
    		     struct clock_event_device *evt)
 {
    struct timer_s *t = &timers[TID_CLOCKEVENT];
@@ -326,13 +326,16 @@ static void davinci_set_mode(enum clock_event_mode mode,
    	break;
    case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static struct clock_event_device clockevent_davinci = {
    .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
    .set_next_event	= davinci_set_next_event,
-	.set_mode	= davinci_set_mode,
+	.set_dev_mode	= davinci_set_mode,
 };
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c
index bf7aa7d..c949daf 100644
--- a/arch/arm/mach-footbridge/dc21285-timer.c
+++ b/arch/arm/mach-footbridge/dc21285-timer.c
@@ -57,7 +57,7 @@ static int ckevt_dc21285_set_next_event(unsigned long delta,
    return 0;
 }
-static void ckevt_dc21285_set_mode(enum clock_event_mode mode,
+static int ckevt_dc21285_set_mode(enum clock_event_mode mode,
    struct clock_event_device *c)
 {
    switch (mode) {
@@ -74,7 +74,10 @@ static void ckevt_dc21285_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_SHUTDOWN:
    	*CSR_TIMER1_CNTL = 0;
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static struct clock_event_device ckevt_dc21285 = {
@@ -84,7 +87,7 @@ static struct clock_event_device ckevt_dc21285 = {
    .rating		= 200,
    .irq		= IRQ_TIMER1,
    .set_next_event	= ckevt_dc21285_set_next_event,
-	.set_mode	= ckevt_dc21285_set_mode,
+	.set_dev_mode	= ckevt_dc21285_set_mode,
 };
static irqreturn_t timer1_interrupt(int irq, void *dev_id)
diff --git a/arch/arm/mach-gemini/time.c b/arch/arm/mach-gemini/time.c
index 0a63c4d..8fea6f3 100644
--- a/arch/arm/mach-gemini/time.c
+++ b/arch/arm/mach-gemini/time.c
@@ -59,7 +59,7 @@ static int gemini_timer_set_next_event(unsigned long cycles,
    return 0;
 }
-static void gemini_timer_set_mode(enum clock_event_mode mode,
+static int gemini_timer_set_mode(enum clock_event_mode mode,
    			  struct clock_event_device *evt)
 {
    u32 period = DIV_ROUND_CLOSEST(tick_rate, HZ);
@@ -91,8 +91,9 @@ static void gemini_timer_set_mode(enum clock_event_mode mode,
    	writel(cr, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE)));
    	break;
    default:
-                break;
+		return -ENOSYS;
    }
+	return 0;
 }
/* Use TIMER2 as clock event */
@@ -101,7 +102,7 @@ static struct clock_event_device gemini_clockevent = {
    .rating		= 300, /* Reasonably fast and accurate clock event */
    .features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
    .set_next_event	= gemini_timer_set_next_event,
-	.set_mode	= gemini_timer_set_mode,
+	.set_dev_mode	= gemini_timer_set_mode,
 };
/*
diff --git a/arch/arm/mach-imx/epit.c b/arch/arm/mach-imx/epit.c
index 074b1a8..a2a8c3d 100644
--- a/arch/arm/mach-imx/epit.c
+++ b/arch/arm/mach-imx/epit.c
@@ -106,7 +106,7 @@ static int epit_set_next_event(unsigned long evt,
    return 0;
 }
-static void epit_set_mode(enum clock_event_mode mode,
+static int epit_set_mode(enum clock_event_mode mode,
    			struct clock_event_device *evt)
 {
    unsigned long flags;
@@ -127,15 +127,9 @@ static void epit_set_mode(enum clock_event_mode mode,
    	epit_irq_acknowledge();
    }
-	/* Remember timer mode */
-	clockevent_mode = mode;
    local_irq_restore(flags);
switch (mode) {
-	case CLOCK_EVT_MODE_PERIODIC:
-		printk(KERN_ERR "epit_set_mode: Periodic mode is not "
-				"supported for i.MX EPIT\n");
-		break;
    case CLOCK_EVT_MODE_ONESHOT:
    /*
     * Do not put overhead of interrupt enable/disable into
@@ -152,7 +146,17 @@ static void epit_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_RESUME:
    	/* Left event sources disabled, no more interrupts appear */
    	break;
+	default:
+		/* Enable interrupts again */
+		local_irq_save(flags);
+		epit_irq_enable();
+		local_irq_restore(flags);
+		return -ENOSYS;
    }
+
+	/* Remember timer mode */
+	clockevent_mode = mode;
+	return 0;
 }
/*
@@ -178,7 +182,7 @@ static struct irqaction epit_timer_irq = {
 static struct clock_event_device clockevent_epit = {
    .name		= "epit",
    .features	= CLOCK_EVT_FEAT_ONESHOT,
-	.set_mode	= epit_set_mode,
+	.set_dev_mode	= epit_set_mode,
    .set_next_event	= epit_set_next_event,
    .rating		= 200,
 };
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
index 65222ea..c0a3159 100644
--- a/arch/arm/mach-imx/time.c
+++ b/arch/arm/mach-imx/time.c
@@ -179,7 +179,7 @@ static const char *clock_event_mode_label[] = {
 };
 #endif /* DEBUG */
-static void mxc_set_mode(enum clock_event_mode mode,
+static int mxc_set_mode(enum clock_event_mode mode,
    			struct clock_event_device *evt)
 {
    unsigned long flags;
@@ -212,15 +212,9 @@ static void mxc_set_mode(enum clock_event_mode mode,
    	clock_event_mode_label[mode]);
 #endif /* DEBUG */
-	/* Remember timer mode */
-	clockevent_mode = mode;
    local_irq_restore(flags);
switch (mode) {
-	case CLOCK_EVT_MODE_PERIODIC:
-		printk(KERN_ERR"mxc_set_mode: Periodic mode is not "
-				"supported for i.MX\n");
-		break;
    case CLOCK_EVT_MODE_ONESHOT:
    /*
     * Do not put overhead of interrupt enable/disable into
@@ -237,7 +231,17 @@ static void mxc_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_RESUME:
    	/* Left event sources disabled, no more interrupts appear */
    	break;
+	default:
+		/* Enable interrupts again */
+		local_irq_save(flags);
+		gpt_irq_enable();
+		local_irq_restore(flags);
+		return -ENOSYS;
    }
+
+	/* Remember timer mode */
+	clockevent_mode = mode;
+	return ret;
 }
/*
@@ -269,7 +273,7 @@ static struct irqaction mxc_timer_irq = {
 static struct clock_event_device clockevent_mxc = {
    .name		= "mxc_timer1",
    .features	= CLOCK_EVT_FEAT_ONESHOT,
-	.set_mode	= mxc_set_mode,
+	.set_dev_mode	= mxc_set_mode,
    .set_next_event	= mx1_2_set_next_event,
    .rating		= 200,
 };
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index dd0cc67..6d338e9 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -307,33 +307,33 @@ static irqreturn_t integrator_timer_interrupt(int irq, void *dev_id)
    return IRQ_HANDLED;
 }
-static void clkevt_set_mode(enum clock_event_mode mode, struct clock_event_device *evt)
+static int clkevt_set_mode(enum clock_event_mode mode, struct clock_event_device *evt)
 {
    u32 ctrl = readl(clkevt_base + TIMER_CTRL) & ~TIMER_CTRL_ENABLE;
-	/* Disable timer */
-	writel(ctrl, clkevt_base + TIMER_CTRL);
-
    switch (mode) {
    case CLOCK_EVT_MODE_PERIODIC:
+		writel(ctrl, clkevt_base + TIMER_CTRL);
    	/* Enable the timer and start the periodic tick */
    	writel(timer_reload, clkevt_base + TIMER_LOAD);
    	ctrl |= TIMER_CTRL_PERIODIC | TIMER_CTRL_ENABLE;
-		writel(ctrl, clkevt_base + TIMER_CTRL);
    	break;
    case CLOCK_EVT_MODE_ONESHOT:
+		writel(ctrl, clkevt_base + TIMER_CTRL);
    	/* Leave the timer disabled, .set_next_event will enable it */
    	ctrl &= ~TIMER_CTRL_PERIODIC;
-		writel(ctrl, clkevt_base + TIMER_CTRL);
    	break;
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_SHUTDOWN:
    case CLOCK_EVT_MODE_RESUME:
-	default:
    	/* Just leave in disabled state */
    	break;
+	default:
+		return -ENOSYS;
    }
+	writel(ctrl, clkevt_base + TIMER_CTRL);
+	return 0;
 }
static int clkevt_set_next_event(unsigned long next, struct clock_event_device *evt)
@@ -350,7 +350,7 @@ static int clkevt_set_next_event(unsigned long next, struct clock_event_device *
 static struct clock_event_device integrator_clockevent = {
    .name		= "timer1",
    .features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-	.set_mode	= clkevt_set_mode,
+	.set_dev_mode	= clkevt_set_mode,
    .set_next_event	= clkevt_set_next_event,
    .rating		= 300,
 };
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index fc4b7b2..05c050a 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -521,7 +521,7 @@ static int ixp4xx_set_next_event(unsigned long evt,
    return 0;
 }
-static void ixp4xx_set_mode(enum clock_event_mode mode,
+static int ixp4xx_set_mode(enum clock_event_mode mode,
    		    struct clock_event_device *evt)
 {
    unsigned long opts = *IXP4XX_OSRT1 & IXP4XX_OST_RELOAD_MASK;
@@ -544,19 +544,21 @@ static void ixp4xx_set_mode(enum clock_event_mode mode,
    	opts |= IXP4XX_OST_ENABLE;
    	break;
    case CLOCK_EVT_MODE_UNUSED:
-	default:
    	osrt = opts = 0;
    	break;
+	default:
+		return -ENOSYS;
    }
*IXP4XX_OSRT1 = osrt | opts;
+	return 0;
 }
static struct clock_event_device clockevent_ixp4xx = {
    .name		= "ixp4xx timer1",
    .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
    .rating         = 200,
-	.set_mode	= ixp4xx_set_mode,
+	.set_dev_mode	= ixp4xx_set_mode,
    .set_next_event	= ixp4xx_set_next_event,
 };
diff --git a/arch/arm/mach-ks8695/time.c b/arch/arm/mach-ks8695/time.c
index a197874..8d2149c 100644
--- a/arch/arm/mach-ks8695/time.c
+++ b/arch/arm/mach-ks8695/time.c
@@ -54,14 +54,15 @@
 /* Timer0 Timeout Counter Register */
 #define T0TC_WATCHDOG		(0xff)		/* Enable watchdog mode */
-static void ks8695_set_mode(enum clock_event_mode mode,
+static int ks8695_set_mode(enum clock_event_mode mode,
    		    struct clock_event_device *evt)
 {
-	u32 tmcon;
+	u32 tmcon, rate, half;
-	if (mode == CLOCK_EVT_FEAT_PERIODIC) {
-		u32 rate = DIV_ROUND_CLOSEST(KS8695_CLOCK_RATE, HZ);
-		u32 half = DIV_ROUND_CLOSEST(rate, 2);
+	switch (mode) {
+	case CLOCK_EVT_MODE_PERIODIC:
+		rate = DIV_ROUND_CLOSEST(KS8695_CLOCK_RATE, HZ);
+		half = DIV_ROUND_CLOSEST(rate, 2);
/* Disable timer 1 */
    	tmcon = readl_relaxed(KS8695_TMR_VA + KS8695_TMCON);
@@ -75,7 +76,16 @@ static void ks8695_set_mode(enum clock_event_mode mode,
    	/* Re-enable timer1 */
    	tmcon |= TMCON_T1EN;
    	writel_relaxed(tmcon, KS8695_TMR_VA + KS8695_TMCON);
+		break;
+	case CLOCK_EVT_MODE_ONESHOT:
+	case CLOCK_EVT_MODE_SHUTDOWN:
+	case CLOCK_EVT_MODE_RESUME:
+	case CLOCK_EVT_MODE_UNUSED:
+		break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static int ks8695_set_next_event(unsigned long cycles,
@@ -106,7 +116,7 @@ static struct clock_event_device clockevent_ks8695 = {
    .rating		= 300, /* Reasonably fast and accurate clock event */
    .features	= CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC,
    .set_next_event	= ks8695_set_next_event,
-	.set_mode	= ks8695_set_mode,
+	.set_dev_mode	= ks8695_set_mode,
 };
/*
diff --git a/arch/arm/mach-lpc32xx/timer.c b/arch/arm/mach-lpc32xx/timer.c
index 4e58372..d57a84d 100644
--- a/arch/arm/mach-lpc32xx/timer.c
+++ b/arch/arm/mach-lpc32xx/timer.c
@@ -43,14 +43,10 @@ static int lpc32xx_clkevt_next_event(unsigned long delta,
    return 0;
 }
-static void lpc32xx_clkevt_mode(enum clock_event_mode mode,
+static int lpc32xx_clkevt_mode(enum clock_event_mode mode,
     struct clock_event_device *dev)
 {
    switch (mode) {
-	case CLOCK_EVT_MODE_PERIODIC:
-		WARN_ON(1);
-		break;
-
    case CLOCK_EVT_MODE_ONESHOT:
    case CLOCK_EVT_MODE_SHUTDOWN:
    	/*
@@ -64,7 +60,10 @@ static void lpc32xx_clkevt_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static struct clock_event_device lpc32xx_clkevt = {
@@ -72,7 +71,7 @@ static struct clock_event_device lpc32xx_clkevt = {
    .features	= CLOCK_EVT_FEAT_ONESHOT,
    .rating		= 300,
    .set_next_event	= lpc32xx_clkevt_next_event,
-	.set_mode	= lpc32xx_clkevt_mode,
+	.set_dev_mode	= lpc32xx_clkevt_mode,
 };
static irqreturn_t lpc32xx_timer_interrupt(int irq, void *dev_id)
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
index 2756351..8491da9 100644
--- a/arch/arm/mach-mmp/time.c
+++ b/arch/arm/mach-mmp/time.c
@@ -124,24 +124,26 @@ static int timer_set_next_event(unsigned long delta,
    return 0;
 }
-static void timer_set_mode(enum clock_event_mode mode,
+static int timer_set_mode(enum clock_event_mode mode,
    		   struct clock_event_device *dev)
 {
    unsigned long flags;
-	local_irq_save(flags);
    switch (mode) {
    case CLOCK_EVT_MODE_ONESHOT:
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_SHUTDOWN:
    	/* disable the matching interrupt */
+		local_irq_save(flags);
    	__raw_writel(0x00, mmp_timer_base + TMR_IER(0));
+		local_irq_restore(flags);
    	break;
    case CLOCK_EVT_MODE_RESUME:
-	case CLOCK_EVT_MODE_PERIODIC:
    	break;
+	default:
+		return -ENOSYS;
    }
-	local_irq_restore(flags);
+	return 0;
 }
static struct clock_event_device ckevt = {
@@ -149,7 +151,7 @@ static struct clock_event_device ckevt = {
    .features	= CLOCK_EVT_FEAT_ONESHOT,
    .rating		= 200,
    .set_next_event	= timer_set_next_event,
-	.set_mode	= timer_set_mode,
+	.set_dev_mode	= timer_set_mode,
 };
static cycle_t clksrc_read(struct clocksource *cs)
diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c
index 5fb2a59..32a6625 100644
--- a/arch/arm/mach-netx/time.c
+++ b/arch/arm/mach-netx/time.c
@@ -34,16 +34,14 @@
 #define TIMER_CLOCKEVENT 0
 #define TIMER_CLOCKSOURCE 1
-static void netx_set_mode(enum clock_event_mode mode,
+static int netx_set_mode(enum clock_event_mode mode,
    	struct clock_event_device *clk)
 {
    u32 tmode;
-	/* disable timer */
-	writel(0, NETX_GPIO_COUNTER_CTRL(TIMER_CLOCKEVENT));
-
    switch (mode) {
    case CLOCK_EVT_MODE_PERIODIC:
+		writel(0, NETX_GPIO_COUNTER_CTRL(TIMER_CLOCKEVENT));
    	writel(NETX_LATCH, NETX_GPIO_COUNTER_MAX(TIMER_CLOCKEVENT));
    	tmode = NETX_GPIO_COUNTER_CTRL_RST_EN |
    		NETX_GPIO_COUNTER_CTRL_IRQ_EN |
@@ -51,23 +49,23 @@ static void netx_set_mode(enum clock_event_mode mode,
    	break;
case CLOCK_EVT_MODE_ONESHOT:
+		writel(0, NETX_GPIO_COUNTER_CTRL(TIMER_CLOCKEVENT));
    	writel(0, NETX_GPIO_COUNTER_MAX(TIMER_CLOCKEVENT));
    	tmode = NETX_GPIO_COUNTER_CTRL_IRQ_EN |
    		NETX_GPIO_COUNTER_CTRL_RUN;
    	break;
-	default:
-		WARN(1, "%s: unhandled mode %d\n", __func__, mode);
-		/* fall through */
-
    case CLOCK_EVT_MODE_SHUTDOWN:
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_RESUME:
    	tmode = 0;
    	break;
+	default:
+		return -ENOSYS;
    }
writel(tmode, NETX_GPIO_COUNTER_CTRL(TIMER_CLOCKEVENT));
+	return 0;
 }
static int netx_set_next_event(unsigned long evt,
@@ -81,7 +79,7 @@ static struct clock_event_device netx_clockevent = {
    .name = "netx-timer" __stringify(TIMER_CLOCKEVENT),
    .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
    .set_next_event = netx_set_next_event,
-	.set_mode = netx_set_mode,
+	.set_dev_mode = netx_set_mode,
 };
/*
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index a7588cf..b2bcd25 100644
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -124,7 +124,7 @@ static int omap_mpu_set_next_event(unsigned long cycles,
    return 0;
 }
-static void omap_mpu_set_mode(enum clock_event_mode mode,
+static int omap_mpu_set_mode(enum clock_event_mode mode,
    		      struct clock_event_device *evt)
 {
    switch (mode) {
@@ -139,14 +139,17 @@ static void omap_mpu_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 clockevent_mpu_timer1 = {
    .name		= "mpu_timer1",
    .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
    .set_next_event	= omap_mpu_set_next_event,
-	.set_mode	= omap_mpu_set_mode,
+	.set_dev_mode	= omap_mpu_set_mode,
 };
static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id)
diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c
index 107e7ab..c589402 100644
--- a/arch/arm/mach-omap1/timer32k.c
+++ b/arch/arm/mach-omap1/timer32k.c
@@ -119,11 +119,9 @@ static int omap_32k_timer_set_next_event(unsigned long delta,
    return 0;
 }
-static void omap_32k_timer_set_mode(enum clock_event_mode mode,
+static int omap_32k_timer_set_mode(enum clock_event_mode mode,
    			    struct clock_event_device *evt)
 {
-	omap_32k_timer_stop();
-
    switch (mode) {
    case CLOCK_EVT_MODE_PERIODIC:
    	omap_32k_timer_start(OMAP_32K_TIMER_TICK_PERIOD);
@@ -131,17 +129,20 @@ static void omap_32k_timer_set_mode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_ONESHOT:
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_SHUTDOWN:
-		break;
    case CLOCK_EVT_MODE_RESUME:
+		omap_32k_timer_stop();
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static struct clock_event_device clockevent_32k_timer = {
    .name		= "32k-timer",
    .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
    .set_next_event	= omap_32k_timer_set_next_event,
-	.set_mode	= omap_32k_timer_set_mode,
+	.set_dev_mode	= omap_32k_timer_set_mode,
 };
static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id)
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index b62de9f..7f13846 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -101,15 +101,14 @@ static int omap2_gp_timer_set_next_event(unsigned long cycles,
    return 0;
 }
-static void omap2_gp_timer_set_mode(enum clock_event_mode mode,
+static int omap2_gp_timer_set_mode(enum clock_event_mode mode,
    			    struct clock_event_device *evt)
 {
    u32 period;
-	__omap_dm_timer_stop(&clkev, OMAP_TIMER_POSTED, clkev.rate);
-
    switch (mode) {
    case CLOCK_EVT_MODE_PERIODIC:
+		__omap_dm_timer_stop(&clkev, OMAP_TIMER_POSTED, clkev.rate);
    	period = clkev.rate / HZ;
    	period -= 1;
    	/* Looks like we need to first set the load value separately */
@@ -120,19 +119,22 @@ static void omap2_gp_timer_set_mode(enum clock_event_mode mode,
    				0xffffffff - period, OMAP_TIMER_POSTED);
    	break;
    case CLOCK_EVT_MODE_ONESHOT:
-		break;
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_SHUTDOWN:
    case CLOCK_EVT_MODE_RESUME:
+		__omap_dm_timer_stop(&clkev, OMAP_TIMER_POSTED, clkev.rate);
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
static struct clock_event_device clockevent_gpt = {
    .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
    .rating		= 300,
    .set_next_event	= omap2_gp_timer_set_next_event,
-	.set_mode	= omap2_gp_timer_set_mode,
+	.set_dev_mode	= omap2_gp_timer_set_mode,
 };
static struct property device_disabled = {
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
index fca174e..a4a8789 100644
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@ -67,7 +67,7 @@ pxa_osmr0_set_next_event(unsigned long delta, struct clock_event_device *dev)
    return (signed)(next - oscr) <= MIN_OSCR_DELTA ? -ETIME : 0;
 }
-static void
+static int
 pxa_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *dev)
 {
    switch (mode) {
@@ -84,9 +84,11 @@ pxa_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *dev)
    	break;
case CLOCK_EVT_MODE_RESUME:
-	case CLOCK_EVT_MODE_PERIODIC:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
#ifdef CONFIG_PM
@@ -130,7 +132,7 @@ static struct clock_event_device ckevt_pxa_osmr0 = {
    .features	= CLOCK_EVT_FEAT_ONESHOT,
    .rating		= 200,
    .set_next_event	= pxa_osmr0_set_next_event,
-	.set_mode	= pxa_osmr0_set_mode,
+	.set_dev_mode	= pxa_osmr0_set_mode,
    .suspend	= pxa_timer_suspend,
    .resume		= pxa_timer_resume,
 };
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 1dea6cf..2282858 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -56,7 +56,7 @@ sa1100_osmr0_set_next_event(unsigned long delta, struct clock_event_device *c)
    return (signed)(next - oscr) <= MIN_OSCR_DELTA ? -ETIME : 0;
 }
-static void
+static int
 sa1100_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *c)
 {
    switch (mode) {
@@ -68,9 +68,11 @@ sa1100_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *c)
    	break;
case CLOCK_EVT_MODE_RESUME:
-	case CLOCK_EVT_MODE_PERIODIC:
    	break;
+	default:
+		return -ENOSYS;
    }
+	return 0;
 }
#ifdef CONFIG_PM
@@ -109,7 +111,7 @@ static struct clock_event_device ckevt_sa1100_osmr0 = {
    .features	= CLOCK_EVT_FEAT_ONESHOT,
    .rating		= 200,
    .set_next_event	= sa1100_osmr0_set_next_event,
-	.set_mode	= sa1100_osmr0_set_mode,
+	.set_dev_mode	= sa1100_osmr0_set_mode,
    .suspend	= sa1100_timer_suspend,
    .resume		= sa1100_timer_resume,
 };
diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c
index 26fda4e..8aa9ea5 100644
--- a/arch/arm/mach-spear/time.c
+++ b/arch/arm/mach-spear/time.c
@@ -66,7 +66,7 @@
 static __iomem void *gpt_base;
 static struct clk *gpt_clk;
-static void clockevent_set_mode(enum clock_event_mode mode,
+static int clockevent_set_mode(enum clock_event_mode mode,
    			struct clock_event_device *clk_event_dev);
 static int clockevent_next_event(unsigned long evt,
    			 struct clock_event_device *clk_event_dev);
@@ -98,12 +98,12 @@ static void __init spear_clocksource_init(void)
 static struct clock_event_device clkevt = {
    .name = "tmr0",
    .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-	.set_mode = clockevent_set_mode,
+	.set_dev_mode = clockevent_set_mode,
    .set_next_event = clockevent_next_event,
    .shift = 0,	/* to be computed */
 };
-static void clockevent_set_mode(enum clock_event_mode mode,
+static int clockevent_set_mode(enum clock_event_mode mode,
    			struct clock_event_device *clk_event_dev)
 {
    u32 period;
@@ -112,10 +112,11 @@ static void clockevent_set_mode(enum clock_event_mode mode,
    /* stop the timer */
    val = readw(gpt_base + CR(CLKEVT));
    val &= ~CTRL_ENABLE;
-	writew(val, gpt_base + CR(CLKEVT));
switch (mode) {
    case CLOCK_EVT_MODE_PERIODIC:
+		writew(val, gpt_base + CR(CLKEVT));
+
    	period = clk_get_rate(gpt_clk) / HZ;
    	period >>= CTRL_PRESCALER16;
    	writew(period, gpt_base + LOAD(CLKEVT));
@@ -123,24 +124,25 @@ static void clockevent_set_mode(enum clock_event_mode mode,
    	val = readw(gpt_base + CR(CLKEVT));
    	val &= ~CTRL_ONE_SHOT;
    	val |= CTRL_ENABLE | CTRL_INT_ENABLE;
-		writew(val, gpt_base + CR(CLKEVT));
break;
    case CLOCK_EVT_MODE_ONESHOT:
+		writew(val, gpt_base + CR(CLKEVT));
+
    	val = readw(gpt_base + CR(CLKEVT));
    	val |= CTRL_ONE_SHOT;
-		writew(val, gpt_base + CR(CLKEVT));
break;
    case CLOCK_EVT_MODE_UNUSED:
    case CLOCK_EVT_MODE_SHUTDOWN:
    case CLOCK_EVT_MODE_RESUME:
-
    	break;
    default:
-		pr_err("Invalid mode requested\n");
-		break;
+		return -ENOSYS;
    }
+
+	writew(val, gpt_base + CR(CLKEVT));
+	return 0;
 }
static int clockevent_next_event(unsigned long cycles,
diff --git a/arch/arm/mach-w90x900/time.c b/arch/arm/mach-w90x900/time.c
index 9230d37..e4a8067 100644
--- a/arch/arm/mach-w90x900/time.c
+++ b/arch/arm/mach-w90x900/time.c
@@ -48,7 +48,7 @@
static unsigned int timer0_load;
-static void nuc900_clockevent_setmode(enum clock_event_mode mode,
+static int nuc900_clockevent_setmode(enum clock_event_mode mode,
    	struct clock_event_device *clk)
 {
    unsigned int val;
@@ -70,9 +70,12 @@ static void nuc900_clockevent_setmode(enum clock_event_mode mode,
    case CLOCK_EVT_MODE_SHUTDOWN:
    case CLOCK_EVT_MODE_RESUME:
    	break;
+	default:
+		return -ENOSYS;
    }
__raw_writel(val, REG_TCSR0);
+	return 0;
 }
static int nuc900_clockevent_setnextevent(unsigned long evt,
@@ -92,7 +95,7 @@ static int nuc900_clockevent_setnextevent(unsigned long evt,
 static struct clock_event_device nuc900_clockevent_device = {
    .name		= "nuc900-timer0",
    .features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-	.set_mode	= nuc900_clockevent_setmode,
+	.set_dev_mode	= nuc900_clockevent_setmode,
    .set_next_event	= nuc900_clockevent_setnextevent,
    .rating		= 300,
 };
diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c
index 6ad65d8..a21a18c 100644
--- a/arch/arm/plat-iop/time.c
+++ b/arch/arm/plat-iop/time.c
@@ -77,7 +77,7 @@ static int iop_set_next_event(unsigned long delta,
static unsigned long ticks_per_jiffy;
-static void iop_set_mode(enum clock_event_mode mode,
+static int iop_set_mode(enum clock_event_mode mode,
    		 struct clock_event_device *unused)
 {
    u32 tmr = read_tmr0();
@@ -98,12 +98,14 @@ static void iop_set_mode(enum clock_event_mode mode,
    	break;
    case CLOCK_EVT_MODE_SHUTDOWN:
    case CLOCK_EVT_MODE_UNUSED:
-	default:
    	tmr &= ~IOP_TMR_EN;
    	break;
+	default:
+		return -ENOSYS;
    }
write_tmr0(tmr);
+	return 0;
 }
static struct clock_event_device iop_clockevent = {
@@ -111,7 +113,7 @@ static struct clock_event_device iop_clockevent = {
    .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
    .rating         = 300,
    .set_next_event	= iop_set_next_event,
-	.set_mode	= iop_set_mode,
+	.set_dev_mode	= iop_set_mode,
 };
static irqreturn_t
diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c
index 261258f..7dc5cc8 100644
--- a/arch/arm/plat-orion/time.c
+++ b/arch/arm/plat-orion/time.c
@@ -106,14 +106,15 @@ orion_clkevt_next_event(unsigned long delta, struct clock_event_device *dev)
    return 0;
 }
-static void
+static int
 orion_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev)
 {
    unsigned long flags;
    u32 u;
local_irq_save(flags);
-	if (mode == CLOCK_EVT_MODE_PERIODIC) {
+	switch (mode) {
+	case CLOCK_EVT_MODE_PERIODIC:
    	/*
    	 * Setup timer to fire at 1/HZ intervals.
    	 */
@@ -132,7 +133,12 @@ orion_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev)
    	u = readl(timer_base + TIMER_CTRL_OFF);
    	writel(u | TIMER1_EN | TIMER1_RELOAD_EN,
    	       timer_base + TIMER_CTRL_OFF);
-	} else {
+		break;
+
+	case CLOCK_EVT_MODE_ONESHOT:
+	case CLOCK_EVT_MODE_UNUSED:
+	case CLOCK_EVT_MODE_SHUTDOWN:
+	case CLOCK_EVT_MODE_RESUME:
    	/*
    	 * Disable timer.
    	 */
@@ -149,9 +155,13 @@ orion_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev)
    	 * ACK pending timer interrupt.
    	 */
    	writel(bridge_timer1_clr_mask, bridge_base + BRIDGE_CAUSE_OFF);
-
+		break;
+	default:
+		local_irq_restore(flags);
+		return -ENOSYS;
    }
    local_irq_restore(flags);
+	return 0;
 }
static struct clock_event_device orion_clkevt = {
@@ -159,7 +169,7 @@ static struct clock_event_device orion_clkevt = {
    .features	= CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC,
    .rating		= 300,
    .set_next_event	= orion_clkevt_next_event,
-	.set_mode	= orion_clkevt_mode,
+	.set_dev_mode	= orion_clkevt_mode,
 };
static irqreturn_t orion_timer_interrupt(int irq, void *dev_id)
-- 
2.0.0.rc2



    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[PATCH V2 2/8] clockevents: arm: migrate to ->set_dev_mode()