| From 1c2fed7587443a8ecc5a766b59ffb3afda2d222f Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Mon, 17 Feb 2014 11:27:49 +0100 |
| Subject: clocksource: sh_cmt: Use request_irq() instead of setup_irq() |
| |
| The driver claims it needs to register an interrupt handler too early |
| for request_irq(). This might have been true in the past, but the only |
| meaningful difference between request_irq() and setup_irq() today is an |
| additional kzalloc() call in request_irq(). As the driver calls |
| kmalloc() itself we know that the slab allocator is available, we can |
| thus switch to request_irq(). |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| (cherry picked from commit dc2eadece70089430f12e4ed6bb1a4421cf3d6f4) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clocksource/sh_cmt.c | 10 +++------- |
| 1 file changed, 3 insertions(+), 7 deletions(-) |
| |
| diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c |
| index 0b1836a6c539..a3103b871260 100644 |
| --- a/drivers/clocksource/sh_cmt.c |
| +++ b/drivers/clocksource/sh_cmt.c |
| @@ -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; |
| -- |
| 2.1.2 |
| |
