diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2009-12-17 12:43:29 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-22 17:04:52 +0100 |
| commit | a602f0f2f04f150fa1f7312b9e601e8e1a5afe10 (patch) | |
| tree | 108f52cfb0450127b0d9390bab101980ca31d73d /arch/arm/plat-nomadik | |
| parent | 501d70383aa9ffc78b41aa7e74f6b0254c7c731c (diff) | |
| download | linux-3.10-a602f0f2f04f150fa1f7312b9e601e8e1a5afe10.tar.gz linux-3.10-a602f0f2f04f150fa1f7312b9e601e8e1a5afe10.tar.bz2 linux-3.10-a602f0f2f04f150fa1f7312b9e601e8e1a5afe10.zip | |
arm/{pxa,sa1100,nomadik}: Don't disable irqs in set_next_event and set_mode
These functions are called with irqs already off. This commit removes
the calls to raw_local_irq_save and raw_local_irq_restore on platforms
that don't have to use a shared interrupt for their timekeeping.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-nomadik')
| -rw-r--r-- | arch/arm/plat-nomadik/timer.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/plat-nomadik/timer.c b/arch/arm/plat-nomadik/timer.c index 62f18ad43a2..fa7cb3a57cb 100644 --- a/arch/arm/plat-nomadik/timer.c +++ b/arch/arm/plat-nomadik/timer.c @@ -49,24 +49,17 @@ static struct clocksource nmdk_clksrc = { static void nmdk_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev) { - unsigned long flags; - switch (mode) { case CLOCK_EVT_MODE_PERIODIC: - /* enable interrupts -- and count current value? */ - raw_local_irq_save(flags); + /* count current value? */ writel(readl(mtu_base + MTU_IMSC) | 1, mtu_base + MTU_IMSC); - raw_local_irq_restore(flags); break; case CLOCK_EVT_MODE_ONESHOT: BUG(); /* Not supported, yet */ /* FALLTHROUGH */ case CLOCK_EVT_MODE_SHUTDOWN: case CLOCK_EVT_MODE_UNUSED: - /* disable irq */ - raw_local_irq_save(flags); writel(readl(mtu_base + MTU_IMSC) & ~1, mtu_base + MTU_IMSC); - raw_local_irq_restore(flags); break; case CLOCK_EVT_MODE_RESUME: break; |