|
@@ -728,12 +728,6 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
|
|
|
goto err1;
|
|
|
}
|
|
|
|
|
|
- /* request irq using setup_irq() (too early for request_irq()) */
|
|
|
- p->irqaction.name = dev_name(&p->pdev->dev);
|
|
|
- p->irqaction.handler = sh_cmt_interrupt;
|
|
|
- p->irqaction.dev_id = p;
|
|
|
- p->irqaction.flags = IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING;
|
|
|
-
|
|
|
/* get hold of clock */
|
|
|
p->clk = clk_get(&p->pdev->dev, "cmt_fck");
|
|
|
if (IS_ERR(p->clk)) {
|
|
@@ -786,7 +780,9 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
|
|
|
}
|
|
|
p->cs_enabled = false;
|
|
|
|
|
|
- ret = setup_irq(irq, &p->irqaction);
|
|
|
+ ret = request_irq(irq, sh_cmt_interrupt,
|
|
|
+ IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING,
|
|
|
+ dev_name(&p->pdev->dev), p);
|
|
|
if (ret) {
|
|
|
dev_err(&p->pdev->dev, "failed to request irq %d\n", irq);
|
|
|
goto err4;
|