Messages in this thread Patch in this message | | | From | Michal Simek <> | Subject | [PATCH] dma: pl330: Simplify irq allocation | Date | Wed, 4 Sep 2013 16:40:17 +0200 |
| |
Use devm_request_irq function.
Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- drivers/dma/pl330.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index fa645d8..1989e4c 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2930,7 +2930,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) amba_set_drvdata(adev, pdmac);
irq = adev->irq[0]; - ret = request_irq(irq, pl330_irq_handler, 0, + ret = devm_request_irq(&adev->dev, irq, pl330_irq_handler, 0, dev_name(&adev->dev), pi); if (ret) return ret; @@ -2938,7 +2938,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) pi->pcfg.periph_id = adev->periphid; ret = pl330_add(pi); if (ret) - goto probe_err1; + return ret;
INIT_LIST_HEAD(&pdmac->desc_pool); spin_lock_init(&pdmac->pool_lock); @@ -3041,8 +3041,6 @@ probe_err3: } probe_err2: pl330_del(pi); -probe_err1: - free_irq(irq, pi);
return ret; } @@ -3052,7 +3050,6 @@ static int pl330_remove(struct amba_device *adev) struct dma_pl330_dmac *pdmac = amba_get_drvdata(adev); struct dma_pl330_chan *pch, *_p; struct pl330_info *pi; - int irq;
if (!pdmac) return 0; @@ -3079,9 +3076,6 @@ static int pl330_remove(struct amba_device *adev)
pl330_del(pi);
- irq = adev->irq[0]; - free_irq(irq, pi); - return 0; }
-- 1.8.2.3 [unhandled content-type:application/pgp-signature] | |