Commit 173e838c authored by Michal Simek's avatar Michal Simek Committed by Vinod Koul

dma: pl330: Simplify irq allocation

Use devm_request_irq function.
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent d0e639c9
...@@ -2923,7 +2923,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -2923,7 +2923,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
amba_set_drvdata(adev, pdmac); amba_set_drvdata(adev, pdmac);
irq = adev->irq[0]; 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); dev_name(&adev->dev), pi);
if (ret) if (ret)
return ret; return ret;
...@@ -2931,7 +2931,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -2931,7 +2931,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
pi->pcfg.periph_id = adev->periphid; pi->pcfg.periph_id = adev->periphid;
ret = pl330_add(pi); ret = pl330_add(pi);
if (ret) if (ret)
goto probe_err1; return ret;
INIT_LIST_HEAD(&pdmac->desc_pool); INIT_LIST_HEAD(&pdmac->desc_pool);
spin_lock_init(&pdmac->pool_lock); spin_lock_init(&pdmac->pool_lock);
...@@ -3044,8 +3044,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -3044,8 +3044,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
} }
probe_err2: probe_err2:
pl330_del(pi); pl330_del(pi);
probe_err1:
free_irq(irq, pi);
return ret; return ret;
} }
...@@ -3055,7 +3053,6 @@ static int pl330_remove(struct amba_device *adev) ...@@ -3055,7 +3053,6 @@ static int pl330_remove(struct amba_device *adev)
struct dma_pl330_dmac *pdmac = amba_get_drvdata(adev); struct dma_pl330_dmac *pdmac = amba_get_drvdata(adev);
struct dma_pl330_chan *pch, *_p; struct dma_pl330_chan *pch, *_p;
struct pl330_info *pi; struct pl330_info *pi;
int irq;
if (!pdmac) if (!pdmac)
return 0; return 0;
...@@ -3082,9 +3079,6 @@ static int pl330_remove(struct amba_device *adev) ...@@ -3082,9 +3079,6 @@ static int pl330_remove(struct amba_device *adev)
pl330_del(pi); pl330_del(pi);
irq = adev->irq[0];
free_irq(irq, pi);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment