linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Alexander Popov <a13xp0p0v88@gmail.com>
To: Gerhard Sittig <gsi@denx.de>,
	Dan Williams <dan.j.williams@intel.com>,
	Vinod Koul <vinod.koul@intel.com>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Arnd Bergmann <arnd@arndb.de>, Anatolij Gustschin <agust@denx.de>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Alexander Popov <a13xp0p0v88@gmail.com>,
	linuxppc-dev@lists.ozlabs.org, dmaengine@vger.kernel.org
Subject: [PATCH RFC v9 3/6] dma: mpc512x: replace devm_request_irq() with request_irq()
Date: Wed, 12 Mar 2014 15:47:52 +0400	[thread overview]
Message-ID: <1394624875-24411-4-git-send-email-a13xp0p0v88@gmail.com> (raw)
In-Reply-To: <1394624875-24411-1-git-send-email-a13xp0p0v88@gmail.com>

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 <a13xp0p0v88@gmail.com>
---
 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");
 			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;
-- 
1.8.4.2

  parent reply	other threads:[~2014-03-12 11:48 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-12 11:47 [PATCH RFC v9 0/6] MPC512x DMA slave s/g support, OF DMA lookup Alexander Popov
2014-03-12 11:47 ` [PATCH RFC v9 1/6] dma: mpc512x: reorder mpc8308 specific instructions Alexander Popov
2014-03-12 11:47 ` [PATCH RFC v9 2/6] dma: mpc512x: add support for peripheral transfers Alexander Popov
2014-03-14  9:47   ` Andy Shevchenko
2014-03-19 13:26     ` Alexander Popov
2014-03-19 14:08       ` Vinod Koul
2014-03-12 11:47 ` Alexander Popov [this message]
2014-03-14  9:50   ` [PATCH RFC v9 3/6] dma: mpc512x: replace devm_request_irq() with request_irq() Andy Shevchenko
2014-03-12 11:47 ` [PATCH RFC v9 4/6] dma: of: Add common xlate function for matching by channel id Alexander Popov
2014-03-12 11:47 ` [PATCH RFC v9 5/6] dma: mpc512x: add device tree binding document Alexander Popov
2014-03-13 18:09   ` Mark Rutland
2014-03-14 10:43     ` Arnd Bergmann
2014-03-12 11:47 ` [PATCH RFC v9 6/6] dma: mpc512x: register for device tree channel lookup Alexander Popov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1394624875-24411-4-git-send-email-a13xp0p0v88@gmail.com \
    --to=a13xp0p0v88@gmail.com \
    --cc=agust@denx.de \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=arnd@arndb.de \
    --cc=dan.j.williams@intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=gsi@denx.de \
    --cc=lars@metafoo.de \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=vinod.koul@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).