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

Commit a602f0f2 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 501d7038

arch/arm/mach-pxa/time.c

+1 −9
Original line number Diff line number Diff line
@@ -76,14 +76,12 @@ pxa_ost0_interrupt(int irq, void *dev_id) 
static int

pxa_osmr0_set_next_event(unsigned long delta, struct clock_event_device *dev)

{

	unsigned long flags, next, oscr;

	unsigned long next, oscr;



	raw_local_irq_save(flags);

	OIER |= OIER_E0;

	next = OSCR + delta;

	OSMR0 = next;

	oscr = OSCR;

	raw_local_irq_restore(flags);



	return (signed)(next - oscr) <= MIN_OSCR_DELTA ? -ETIME : 0;

}
@@ -91,23 +89,17 @@ pxa_osmr0_set_next_event(unsigned long delta, struct clock_event_device *dev) 
static void

pxa_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *dev)

{

	unsigned long irqflags;



	switch (mode) {

	case CLOCK_EVT_MODE_ONESHOT:

		raw_local_irq_save(irqflags);

		OIER &= ~OIER_E0;

		OSSR = OSSR_M0;

		raw_local_irq_restore(irqflags);

		break;



	case CLOCK_EVT_MODE_UNUSED:

	case CLOCK_EVT_MODE_SHUTDOWN:

		/* initializing, released, or preparing for suspend */

		raw_local_irq_save(irqflags);

		OIER &= ~OIER_E0;

		OSSR = OSSR_M0;

		raw_local_irq_restore(irqflags);

		break;



	case CLOCK_EVT_MODE_RESUME:

arch/arm/mach-sa1100/time.c

+1 −7
Original line number Diff line number Diff line
@@ -35,14 +35,12 @@ static irqreturn_t sa1100_ost0_interrupt(int irq, void *dev_id) 
static int

sa1100_osmr0_set_next_event(unsigned long delta, struct clock_event_device *c)

{

	unsigned long flags, next, oscr;

	unsigned long next, oscr;



	raw_local_irq_save(flags);

	OIER |= OIER_E0;

	next = OSCR + delta;

	OSMR0 = next;

	oscr = OSCR;

	raw_local_irq_restore(flags);



	return (signed)(next - oscr) <= MIN_OSCR_DELTA ? -ETIME : 0;

}
@@ -50,16 +48,12 @@ sa1100_osmr0_set_next_event(unsigned long delta, struct clock_event_device *c) 
static void

sa1100_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *c)

{

	unsigned long flags;



	switch (mode) {

	case CLOCK_EVT_MODE_ONESHOT:

	case CLOCK_EVT_MODE_UNUSED:

	case CLOCK_EVT_MODE_SHUTDOWN:

		raw_local_irq_save(flags);

		OIER &= ~OIER_E0;

		OSSR = OSSR_M0;

		raw_local_irq_restore(flags);

		break;



	case CLOCK_EVT_MODE_RESUME:

arch/arm/plat-nomadik/timer.c

+1 −8
Original line number Diff line number Diff line
@@ -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;