From patchwork Thu May 16 06:58:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2575721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 3AC553FE1F for ; Thu, 16 May 2013 07:29:46 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UcsAU-00053u-Cr; Thu, 16 May 2013 07:00:04 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ucs9V-0000x0-Tl; Thu, 16 May 2013 06:59:01 +0000 Received: from mail-pd0-f172.google.com ([209.85.192.172]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ucs9T-0000w4-B3 for linux-arm-kernel@lists.infradead.org; Thu, 16 May 2013 06:59:00 +0000 Received: by mail-pd0-f172.google.com with SMTP id 6so2073122pdd.3 for ; Wed, 15 May 2013 23:58:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=ofHnMx4zNKxeMePEoO31gnUoQK529VSC5cvFoQ5/EuM=; b=RHHuLz7+SJGu3P1vA3G3DaGkY70moFT644F2lQH3ngmGSsOBjcTTZmso0CFGjcb1QN esruhUTk///b26lLs4zUxUSEqDkB706CYyQGFzJE1TdNWiNfe7+JZheybuBoJlye6cyK eE6qO8QclN2VpAXQBFBkbT2skOgUhWubvQ2EhHe81SHhw3L2m+vwm7ky0Lg0e82Z8RIv NgGSN9ZyYid74/zPoWBMkbRrhJlEltqOrdGUybU1hm7Kyz8eRkJU3Hw3q71R0sgD05SV QKHk02Enh/bOv0KOI9gN8rLGvNlS10iQhdL2bu3KiANzaG+mx7rw9F/38Hypr/hGMK9T EQqA== X-Received: by 10.68.6.168 with SMTP id c8mr21900269pba.184.1368687517766; Wed, 15 May 2013 23:58:37 -0700 (PDT) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPSA id gc5sm5675770pbb.19.2013.05.15.23.58.34 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 15 May 2013 23:58:36 -0700 (PDT) From: Lad Prabhakar To: Sekhar Nori , DLOS , LAK Subject: [PATCH] ARM: davinci: dma: Convert to devm_* api Date: Thu, 16 May 2013 12:28:22 +0530 Message-Id: <1368687502-15551-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.4.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130516_025859_467654_EBC6E25E X-CRM114-Status: GOOD ( 12.79 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (prabhakar.csengg[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.192.172 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: "Lad, Prabhakar" , LKML X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Lad, Prabhakar Use devm_ioremap_resource instead of reques_mem_region()/ioremap() and devm_request_irq() instead of request_irq(). This ensures more consistent error values and simplifies error paths. Signed-off-by: Lad, Prabhakar --- NOte:- Boot tested on Logic-PD OMAP-L138 EVM arch/arm/mach-davinci/dma.c | 63 ++++++++++++++++-------------------------- 1 files changed, 24 insertions(+), 39 deletions(-) diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c index 45b7c71..aeda496 100644 --- a/arch/arm/mach-davinci/dma.c +++ b/arch/arm/mach-davinci/dma.c @@ -1402,7 +1402,6 @@ static int __init edma_probe(struct platform_device *pdev) int irq[EDMA_MAX_CC] = {0, 0}; int err_irq[EDMA_MAX_CC] = {0, 0}; struct resource *r[EDMA_MAX_CC] = {NULL}; - resource_size_t len[EDMA_MAX_CC]; char res_name[10]; char irq_name[10]; @@ -1422,25 +1421,16 @@ static int __init edma_probe(struct platform_device *pdev) found = 1; } - len[j] = resource_size(r[j]); - - r[j] = request_mem_region(r[j]->start, len[j], - dev_name(&pdev->dev)); - if (!r[j]) { - status = -EBUSY; - goto fail1; - } - - edmacc_regs_base[j] = ioremap(r[j]->start, len[j]); - if (!edmacc_regs_base[j]) { + edmacc_regs_base[j] = devm_ioremap_resource(&pdev->dev, r[j]); + if (IS_ERR(edmacc_regs_base[j])) { status = -EBUSY; - goto fail1; + goto fail; } edma_cc[j] = kzalloc(sizeof(struct edma), GFP_KERNEL); if (!edma_cc[j]) { status = -ENOMEM; - goto fail1; + goto fail; } edma_cc[j]->num_channels = min_t(unsigned, info[j]->n_channel, @@ -1491,10 +1481,12 @@ static int __init edma_probe(struct platform_device *pdev) sprintf(irq_name, "edma%d", j); irq[j] = platform_get_irq_byname(pdev, irq_name); edma_cc[j]->irq_res_start = irq[j]; - status = request_irq(irq[j], dma_irq_handler, 0, "edma", - &pdev->dev); + status = devm_request_irq(&pdev->dev, irq[j], + dma_irq_handler, 0, "edma", + &pdev->dev); if (status < 0) { - dev_dbg(&pdev->dev, "request_irq %d failed --> %d\n", + dev_dbg(&pdev->dev, + "devm_request_irq %d failed --> %d\n", irq[j], status); goto fail; } @@ -1502,10 +1494,12 @@ static int __init edma_probe(struct platform_device *pdev) sprintf(irq_name, "edma%d_err", j); err_irq[j] = platform_get_irq_byname(pdev, irq_name); edma_cc[j]->irq_res_end = err_irq[j]; - status = request_irq(err_irq[j], dma_ccerr_handler, 0, - "edma_error", &pdev->dev); + status = devm_request_irq(&pdev->dev, err_irq[j], + dma_ccerr_handler, 0, + "edma_error", &pdev->dev); if (status < 0) { - dev_dbg(&pdev->dev, "request_irq %d failed --> %d\n", + dev_dbg(&pdev->dev, + "devm_request_irq %d failed --> %d\n", err_irq[j], status); goto fail; } @@ -1542,17 +1536,20 @@ static int __init edma_probe(struct platform_device *pdev) } if (tc_errs_handled) { - status = request_irq(IRQ_TCERRINT0, dma_tc0err_handler, 0, - "edma_tc0", &pdev->dev); + status = devm_request_irq(&pdev->dev, IRQ_TCERRINT0, + dma_tc0err_handler, 0, + "edma_tc0", &pdev->dev); if (status < 0) { - dev_dbg(&pdev->dev, "request_irq %d failed --> %d\n", + dev_dbg(&pdev->dev, + "devm_request_irq %d failed --> %d\n", IRQ_TCERRINT0, status); return status; } - status = request_irq(IRQ_TCERRINT, dma_tc1err_handler, 0, - "edma_tc1", &pdev->dev); + status = devm_request_irq(&pdev->dev, IRQ_TCERRINT, + dma_tc1err_handler, 0, + "edma_tc1", &pdev->dev); if (status < 0) { - dev_dbg(&pdev->dev, "request_irq %d --> %d\n", + dev_dbg(&pdev->dev, "devm_request_irq %d --> %d\n", IRQ_TCERRINT, status); return status; } @@ -1561,20 +1558,8 @@ static int __init edma_probe(struct platform_device *pdev) return 0; fail: - for (i = 0; i < EDMA_MAX_CC; i++) { - if (err_irq[i]) - free_irq(err_irq[i], &pdev->dev); - if (irq[i]) - free_irq(irq[i], &pdev->dev); - } -fail1: - for (i = 0; i < EDMA_MAX_CC; i++) { - if (r[i]) - release_mem_region(r[i]->start, len[i]); - if (edmacc_regs_base[i]) - iounmap(edmacc_regs_base[i]); + for (i = 0; i < EDMA_MAX_CC; i++) kfree(edma_cc[i]); - } return status; }