From patchwork Wed Mar 12 11:47:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Popov X-Patchwork-Id: 329412 X-Patchwork-Delegate: agust@denx.de Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 9CA6E2C06BE for ; Wed, 12 Mar 2014 22:50:58 +1100 (EST) Received: from mail-la0-x230.google.com (mail-la0-x230.google.com [IPv6:2a00:1450:4010:c03::230]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4A80A2C00AB for ; Wed, 12 Mar 2014 22:48:20 +1100 (EST) Received: by mail-la0-f48.google.com with SMTP id gf5so6435063lab.7 for ; Wed, 12 Mar 2014 04:48:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=lI5QdXadWAPjCjL/yEgqO00JMBHzARfZdymXyaSMVM8=; b=tBv67PJsTDdK3+h1PLMi6mSZC7LxP/shtMhyR4SArO47yGd12scjYBYDa+hoFZG77Q nstwkywfLwREw61/ihUbrMzMutnYZb141VvXjSCzbhCxBZ29xkk2tD/2ZUJy1Fel0zxg TS/MgV+0erL1K+yufJa+SA9eSj3rIJFDnaKg1LIdbFKhfQAB83GuwUd42SX0qw96i3gB hfpJOCfJjN8DoCWhsTQ13gQM+Q+Wnwz3VbG/pgBGLfmQao3L24OY6TPSd3OmsrYmymjr /EyZwD1OvOvLiMZEd3qtHlhpy1SLFvvxH6YHmxZReyF1iv7HLyKKrCzzdaMhbWvaA4gD puuA== X-Received: by 10.152.21.166 with SMTP id w6mr1518337lae.39.1394624896553; Wed, 12 Mar 2014 04:48:16 -0700 (PDT) Received: from a13xCCC.localdomain ([89.175.56.18]) by mx.google.com with ESMTPSA id sx1sm39774191lac.1.2014.03.12.04.48.15 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 12 Mar 2014 04:48:15 -0700 (PDT) From: Alexander Popov To: Gerhard Sittig , Dan Williams , Vinod Koul , Lars-Peter Clausen , Arnd Bergmann , Anatolij Gustschin , Andy Shevchenko , Alexander Popov , 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 Message-Id: <1394624875-24411-4-git-send-email-a13xp0p0v88@gmail.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1394624875-24411-1-git-send-email-a13xp0p0v88@gmail.com> References: <1394624875-24411-1-git-send-email-a13xp0p0v88@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 --- 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;