clocksource: sh_cmt: use remove_irq() and remove clockevent workaround
Update the sh_cmt driver to make use of recent irq and clockevent changes:
- use remove_irq() together with setup_irq()
- remove mult workaround since WARN_ON() now has been moved
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 7783b42..1c92c39 100644
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -465,7 +465,6 @@
ced->set_mode = sh_cmt_clock_event_mode;
pr_info("sh_cmt: %s used for clock events\n", ced->name);
- ced->mult = 1; /* work around misplaced WARN_ON() in clockevents.c */
clockevents_register_device(ced);
}
@@ -557,7 +556,7 @@
cfg->clockevent_rating,
cfg->clocksource_rating);
err2:
- free_irq(irq, p);
+ remove_irq(irq, &p->irqaction);
err1:
iounmap(p->mapbase);
err0: