adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

clocksource: sh_cmt: use remove_irq() and remove clockevent workaround

Browse source 
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>
This commit is contained in:
Magnus Damm 2009-04-01 14:11:07 +00:00 committed by Paul Mundt
parent c4361bb64b
commit 3093e78eba
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/clocksource/sh_cmt.c
View file

@ -465,7 +465,6 @@ static void sh_cmt_register_clockevent(struct sh_cmt_priv *p,
ced->set_mode = sh_cmt_clock_event_mode; ced->set_mode = sh_cmt_clock_event_mode;
pr_info("sh_cmt: %s used for clock events\n", ced->name); 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); clockevents_register_device(ced);
} }
@ -557,7 +556,7 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
cfg->clockevent_rating, cfg->clockevent_rating,
cfg->clocksource_rating); cfg->clocksource_rating);
err2: err2:
free_irq(irq, p); remove_irq(irq, &p->irqaction);
err1: err1:
iounmap(p->mapbase); iounmap(p->mapbase);
err0: err0: