Re: [PATCH RFC v9 3/6] dma: mpc512x: replace devm_request_irq() with request_irq()
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: 2014-03-14 09:50:37
On Wed, 2014-03-12 at 15:47 +0400, Alexander Popov wrote:
quoted hunk ↗ jump to hunk
Replace devm_request_irq() with request_irq() since there is no need to use it because the original code always frees IRQ manually with devm_free_irq(). Replace devm_free_irq() with free_irq() accordingly. Signed-off-by: Alexander Popov <redacted> --- drivers/dma/mpc512x_dma.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c index b1e430c..ff7f678 100644 --- a/drivers/dma/mpc512x_dma.c +++ b/drivers/dma/mpc512x_dma.c@@ -921,16 +921,15 @@ static int mpc_dma_probe(struct platform_device *op) mdma->tcd = (struct mpc_dma_tcd *)((u8 *)(mdma->regs) + MPC_DMA_TCD_OFFSET); - retval = devm_request_irq(dev, mdma->irq, &mpc_dma_irq, 0, DRV_NAME, - mdma); + retval = request_irq(mdma->irq, &mpc_dma_irq, 0, DRV_NAME, mdma); if (retval) { dev_err(dev, "Error requesting IRQ!\n"); return -EINVAL; } if (mdma->is_mpc8308) { - retval = devm_request_irq(dev, mdma->irq2, &mpc_dma_irq, 0, - DRV_NAME, mdma); + retval = request_irq(mdma->irq2, &mpc_dma_irq, 0, + DRV_NAME, mdma); if (retval) { dev_err(dev, "Error requesting IRQ2!\n");
+ free_irq(IRQ1) here and may be in other places.
quoted hunk ↗ jump to hunk
return -EINVAL;@@ -1020,7 +1019,7 @@ static int mpc_dma_probe(struct platform_device *op) dev_set_drvdata(dev, mdma); retval = dma_async_device_register(dma); if (retval) { - devm_free_irq(dev, mdma->irq, mdma); + free_irq(mdma->irq, mdma); irq_dispose_mapping(mdma->irq); }@@ -1033,7 +1032,7 @@ static int mpc_dma_remove(struct platform_device *op) struct mpc_dma *mdma = dev_get_drvdata(dev); dma_async_device_unregister(&mdma->dma); - devm_free_irq(dev, mdma->irq, mdma); + free_irq(mdma->irq, mdma); irq_dispose_mapping(mdma->irq); return 0;
-- Andy Shevchenko [off-list ref] Intel Finland Oy