Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/dma/pl330.c

+2 −8
Original line number Diff line number Diff line
@@ -2923,7 +2923,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;
@@ -2931,7 +2931,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);
@@ -3044,8 +3044,6 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) 
	}

probe_err2:

	pl330_del(pi);

probe_err1:

	free_irq(irq, pi);



	return ret;

}
@@ -3055,7 +3053,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;
@@ -3082,9 +3079,6 @@ static int pl330_remove(struct amba_device *adev) 


	pl330_del(pi);



	irq = adev->irq[0];

	free_irq(irq, pi);



	return 0;

}