From patchwork Mon Aug 4 12:07:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pramod Gurav X-Patchwork-Id: 4669931 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C4281C0338 for ; Mon, 4 Aug 2014 12:11:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 82867200E6 for ; Mon, 4 Aug 2014 12:11:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1718D20149 for ; Mon, 4 Aug 2014 12:11:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752298AbaHDMLd (ORCPT ); Mon, 4 Aug 2014 08:11:33 -0400 Received: from smtp94.ord1c.emailsrvr.com ([108.166.43.94]:37420 "EHLO smtp94.ord1c.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752337AbaHDMLc (ORCPT ); Mon, 4 Aug 2014 08:11:32 -0400 X-Greylist: delayed 447 seconds by postgrey-1.27 at vger.kernel.org; Mon, 04 Aug 2014 08:11:31 EDT Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp12.relay.ord1c.emailsrvr.com (SMTP Server) with ESMTP id EBD328022B; Mon, 4 Aug 2014 08:04:03 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp12.relay.ord1c.emailsrvr.com (Authenticated sender: pramod.gurav-AT-smartplayin.com) with ESMTPSA id BB04B80246; Mon, 4 Aug 2014 08:04:01 -0400 (EDT) X-Sender-Id: pramod.gurav@smartplayin.com Received: from SPINITLTDL00278.smartplayin.local ([UNAVAILABLE]. [220.227.185.53]) (using TLSv1.1 with cipher DHE-RSA-AES256-SHA) by 0.0.0.0:465 (trex/5.2.10); Mon, 04 Aug 2014 12:04:03 GMT From: Pramod Gurav To: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: Pramod Gurav , Stepan Moskovchenko , Joerg Roedel , Stephen Boyd Subject: [PATCH] iommu/msm: Switch to using managed resources Date: Mon, 4 Aug 2014 17:37:37 +0530 Message-Id: <1407154057-25440-1-git-send-email-pramod.gurav@smartplayin.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This switches the driver to using managed resources to simplify error handling and to do away with remove function. CC: Stepan Moskovchenko CC: Joerg Roedel CC: Stephen Boyd Signed-off-by: Pramod Gurav --- drivers/iommu/msm_iommu_dev.c | 76 +++++++++++------------------------------ 1 file changed, 19 insertions(+), 57 deletions(-) diff --git a/drivers/iommu/msm_iommu_dev.c b/drivers/iommu/msm_iommu_dev.c index 61def7cb..38a538f 100644 --- a/drivers/iommu/msm_iommu_dev.c +++ b/drivers/iommu/msm_iommu_dev.c @@ -140,39 +140,29 @@ static int msm_iommu_probe(struct platform_device *pdev) return 0; } - drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL); - - if (!drvdata) { - ret = -ENOMEM; - goto fail; - } + if (!iommu_dev) + return -ENOMEM; - if (!iommu_dev) { - ret = -ENODEV; - goto fail; - } + drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) + return -ENOMEM; - iommu_pclk = clk_get(NULL, "smmu_pclk"); - if (IS_ERR(iommu_pclk)) { - ret = -ENODEV; - goto fail; - } + iommu_pclk = devm_clk_get(&pdev->dev, "smmu_pclk"); + if (IS_ERR(iommu_pclk)) + return -ENODEV; ret = clk_prepare_enable(iommu_pclk); if (ret) - goto fail_enable; - - iommu_clk = clk_get(&pdev->dev, "iommu_clk"); + return ret; + iommu_clk = devm_clk_get(&pdev->dev, "iommu_clk"); if (!IS_ERR(iommu_clk)) { if (clk_get_rate(iommu_clk) == 0) clk_set_rate(iommu_clk, 1); ret = clk_prepare_enable(iommu_clk); - if (ret) { - clk_put(iommu_clk); + if (ret) goto fail_pclk; - } } else iommu_clk = NULL; @@ -205,14 +195,13 @@ static int msm_iommu_probe(struct platform_device *pdev) goto fail_clk; } - ret = request_irq(irq, msm_iommu_fault_handler, 0, + ret = devm_request_irq(&pdev->dev, irq, msm_iommu_fault_handler, 0, "msm_iommu_secure_irpt_handler", drvdata); if (ret) { pr_err("Request IRQ %d failed with ret=%d\n", irq, ret); goto fail_clk; } - drvdata->pclk = iommu_pclk; drvdata->clk = iommu_clk; drvdata->base = regs_base; @@ -231,16 +220,10 @@ static int msm_iommu_probe(struct platform_device *pdev) return 0; fail_clk: - if (iommu_clk) { + if (iommu_clk) clk_disable(iommu_clk); - clk_put(iommu_clk); - } fail_pclk: clk_disable_unprepare(iommu_pclk); -fail_enable: - clk_put(iommu_pclk); -fail: - kfree(drvdata); return ret; } @@ -250,14 +233,9 @@ static int msm_iommu_remove(struct platform_device *pdev) drv = platform_get_drvdata(pdev); if (drv) { - if (drv->clk) { + if (drv->clk) clk_unprepare(drv->clk); - clk_put(drv->clk); - } clk_unprepare(drv->pclk); - clk_put(drv->pclk); - memset(drv, 0, sizeof(*drv)); - kfree(drv); } return 0; } @@ -276,7 +254,8 @@ static int msm_iommu_ctx_probe(struct platform_device *pdev) if (!drvdata) return -ENODEV; - ctx_drvdata = kzalloc(sizeof(*ctx_drvdata), GFP_KERNEL); + ctx_drvdata = devm_kzalloc(&pdev->dev, sizeof(*ctx_drvdata), + GFP_KERNEL); if (!ctx_drvdata) return -ENOMEM; @@ -288,14 +267,12 @@ static int msm_iommu_ctx_probe(struct platform_device *pdev) ret = clk_prepare_enable(drvdata->pclk); if (ret) - goto fail; + return ret; if (drvdata->clk) { ret = clk_prepare_enable(drvdata->clk); - if (ret) { + if (ret) clk_disable_unprepare(drvdata->pclk); - goto fail; - } } /* Program the M2V tables for this context */ @@ -329,20 +306,6 @@ static int msm_iommu_ctx_probe(struct platform_device *pdev) dev_info(&pdev->dev, "context %s using bank %d\n", c->name, c->num); return 0; -fail: - kfree(ctx_drvdata); - return ret; -} - -static int msm_iommu_ctx_remove(struct platform_device *pdev) -{ - struct msm_iommu_ctx_drvdata *drv = NULL; - drv = platform_get_drvdata(pdev); - if (drv) { - memset(drv, 0, sizeof(struct msm_iommu_ctx_drvdata)); - kfree(drv); - } - return 0; } static struct platform_driver msm_iommu_driver = { @@ -350,7 +313,7 @@ static struct platform_driver msm_iommu_driver = { .name = "msm_iommu", }, .probe = msm_iommu_probe, - .remove = msm_iommu_remove, + .remove = msm_iommu_remove, }; static struct platform_driver msm_iommu_ctx_driver = { @@ -358,7 +321,6 @@ static struct platform_driver msm_iommu_ctx_driver = { .name = "msm_iommu_ctx", }, .probe = msm_iommu_ctx_probe, - .remove = msm_iommu_ctx_remove, }; static int __init msm_iommu_driver_init(void)