mirror of
https://github.com/torvalds/linux.git
synced 2024-12-03 01:21:28 +00:00
clocksource: exynos_mct: use (request/free)_irq calls for local timer registration
Replace the (setup/remove)_irq calls for local timer registration with (request/free)_irq calls. This generalizes the local timer registration API. Suggested by Mark Rutland. Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org> Acked-by: Mark Rutland <mark.rutland@arm.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
parent
34dcedfbf9
commit
7114cd749a
@ -400,18 +400,6 @@ static irqreturn_t exynos4_mct_tick_isr(int irq, void *dev_id)
|
|||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqaction mct_tick0_event_irq = {
|
|
||||||
.name = "mct_tick0_irq",
|
|
||||||
.flags = IRQF_TIMER | IRQF_NOBALANCING,
|
|
||||||
.handler = exynos4_mct_tick_isr,
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct irqaction mct_tick1_event_irq = {
|
|
||||||
.name = "mct_tick1_irq",
|
|
||||||
.flags = IRQF_TIMER | IRQF_NOBALANCING,
|
|
||||||
.handler = exynos4_mct_tick_isr,
|
|
||||||
};
|
|
||||||
|
|
||||||
static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt)
|
static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt)
|
||||||
{
|
{
|
||||||
struct mct_clock_event_device *mevt;
|
struct mct_clock_event_device *mevt;
|
||||||
@ -435,16 +423,15 @@ static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt)
|
|||||||
exynos4_mct_write(TICK_BASE_CNT, mevt->base + MCT_L_TCNTB_OFFSET);
|
exynos4_mct_write(TICK_BASE_CNT, mevt->base + MCT_L_TCNTB_OFFSET);
|
||||||
|
|
||||||
if (mct_int_type == MCT_INT_SPI) {
|
if (mct_int_type == MCT_INT_SPI) {
|
||||||
if (cpu == 0) {
|
evt->irq = mct_irqs[MCT_L0_IRQ + cpu];
|
||||||
mct_tick0_event_irq.dev_id = mevt;
|
if (request_irq(evt->irq, exynos4_mct_tick_isr,
|
||||||
evt->irq = mct_irqs[MCT_L0_IRQ];
|
IRQF_TIMER | IRQF_NOBALANCING,
|
||||||
setup_irq(evt->irq, &mct_tick0_event_irq);
|
evt->name, mevt)) {
|
||||||
} else {
|
pr_err("exynos-mct: cannot register IRQ %d\n",
|
||||||
mct_tick1_event_irq.dev_id = mevt;
|
evt->irq);
|
||||||
evt->irq = mct_irqs[MCT_L1_IRQ];
|
return -EIO;
|
||||||
setup_irq(evt->irq, &mct_tick1_event_irq);
|
|
||||||
irq_set_affinity(evt->irq, cpumask_of(1));
|
|
||||||
}
|
}
|
||||||
|
irq_set_affinity(evt->irq, cpumask_of(cpu));
|
||||||
} else {
|
} else {
|
||||||
enable_percpu_irq(mct_irqs[MCT_L0_IRQ], 0);
|
enable_percpu_irq(mct_irqs[MCT_L0_IRQ], 0);
|
||||||
}
|
}
|
||||||
@ -454,13 +441,9 @@ static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt)
|
|||||||
|
|
||||||
static void exynos4_local_timer_stop(struct clock_event_device *evt)
|
static void exynos4_local_timer_stop(struct clock_event_device *evt)
|
||||||
{
|
{
|
||||||
unsigned int cpu = smp_processor_id();
|
|
||||||
evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
|
evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
|
||||||
if (mct_int_type == MCT_INT_SPI)
|
if (mct_int_type == MCT_INT_SPI)
|
||||||
if (cpu == 0)
|
free_irq(evt->irq, this_cpu_ptr(&percpu_mct_tick));
|
||||||
remove_irq(evt->irq, &mct_tick0_event_irq);
|
|
||||||
else
|
|
||||||
remove_irq(evt->irq, &mct_tick1_event_irq);
|
|
||||||
else
|
else
|
||||||
disable_percpu_irq(mct_irqs[MCT_L0_IRQ]);
|
disable_percpu_irq(mct_irqs[MCT_L0_IRQ]);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user