From patchwork Sun Jun 29 16:21:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 4444731 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 690829F387 for ; Sun, 29 Jun 2014 16:25:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 91E42202F8 for ; Sun, 29 Jun 2014 16:25:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C4DD32034E for ; Sun, 29 Jun 2014 16:25:12 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X1HsJ-0003Xw-4x; Sun, 29 Jun 2014 16:22:43 +0000 Received: from mail-we0-x229.google.com ([2a00:1450:400c:c03::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X1Hrv-0003OE-Ma for linux-arm-kernel@lists.infradead.org; Sun, 29 Jun 2014 16:22:20 +0000 Received: by mail-we0-f169.google.com with SMTP id t60so7228610wes.0 for ; Sun, 29 Jun 2014 09:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ye9+R0jmNFg0zAyAL5TDgeQohnYQPH3Xht16GvswfK8=; b=VYxF/SGYCJDyXhXcDG49/kMnIVIEzKydemZlgmcPgkqjAzasO1OLVLQMw4KShTjwQo lQEH7jbTOALd73Wwy01qvZkO64RAJE22u9RRU0hL1iZIGgV5y0g+8s/r1x7OUlrDyoG6 tunK2rRRzlj2mT9EZSBBQ79UIWm8ovNfkD4N+cShMk7c4iEGc8kOAHxwxGPX9XZGSyeh u9k2O1d+wDqx9G2zm7QRq2oZhjkKtLS+Kbzwlx04nS5mLzNfAYlMuF7opRqdoGXTQYUF uIY5v64CDl4KneGAe5VuBbcnz8NPYis4HMbiLec9Wa0TVJw+vyqMX+MvH1HsTRPV+8XV IpaQ== X-Received: by 10.194.62.5 with SMTP id u5mr37629365wjr.46.1404058917616; Sun, 29 Jun 2014 09:21:57 -0700 (PDT) Received: from mamamia.internal (a89-182-10-130.net-htp.de. [89.182.10.130]) by mx.google.com with ESMTPSA id gh16sm21137573wic.3.2014.06.29.09.21.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 Jun 2014 09:21:57 -0700 (PDT) From: Andre Heider To: linux-omap@vger.kernel.org Subject: [PATCH 03/13] uio: uio_pruss: use devm_ioremap_resource() Date: Sun, 29 Jun 2014 18:21:37 +0200 Message-Id: <1404058907-21112-4-git-send-email-a.heider@gmail.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1404058907-21112-1-git-send-email-a.heider@gmail.com> References: <1404058907-21112-1-git-send-email-a.heider@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140629_092219_939241_39253E34 X-CRM114-Status: GOOD ( 12.29 ) X-Spam-Score: -0.8 (/) Cc: devicetree@vger.kernel.org, Paul Walmsley , Tony Lindgren , Greg Kroah-Hartman , Matt Porter , "Hans J . Koch" , =?UTF-8?q?Beno=C3=AEt=20Cousson?= , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 Replace resource_size() followed by ioremap() with devm_ioremap_resource() and remove the iounmap() call. Signed-off-by: Andre Heider --- drivers/uio/uio_pruss.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/uio/uio_pruss.c b/drivers/uio/uio_pruss.c index f07545b..310598a 100644 --- a/drivers/uio/uio_pruss.c +++ b/drivers/uio/uio_pruss.c @@ -100,7 +100,6 @@ static void pruss_cleanup(struct device *dev, struct uio_pruss_dev *gdev) uio_unregister_device(p); kfree(p->name); } - iounmap(gdev->prussio_vaddr); if (gdev->ddr_vaddr) { dma_free_coherent(dev, extram_pool_sz, gdev->ddr_vaddr, gdev->ddr_paddr); @@ -118,7 +117,7 @@ static int pruss_probe(struct platform_device *pdev) struct uio_pruss_dev *gdev; struct resource *regs_prussio; struct device *dev = &pdev->dev; - int ret = -ENODEV, cnt = 0, len; + int ret = -ENODEV, cnt = 0; struct uio_pruss_pdata *pdata = dev_get_platdata(dev); gdev = devm_kzalloc(dev, sizeof(struct uio_pruss_dev), GFP_KERNEL); @@ -139,13 +138,9 @@ static int pruss_probe(struct platform_device *pdev) } regs_prussio = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!regs_prussio) { - dev_err(dev, "No PRUSS I/O resource specified\n"); - goto out_free; - } - - if (!regs_prussio->start) { - dev_err(dev, "Invalid memory resource\n"); + gdev->prussio_vaddr = devm_ioremap_resource(dev, regs_prussio); + if (IS_ERR(gdev->prussio_vaddr)) { + ret = PTR_ERR(gdev->prussio_vaddr); goto out_free; } @@ -167,13 +162,6 @@ static int pruss_probe(struct platform_device *pdev) goto out_free; } - len = resource_size(regs_prussio); - gdev->prussio_vaddr = ioremap(regs_prussio->start, len); - if (!gdev->prussio_vaddr) { - dev_err(dev, "Can't remap PRUSS I/O address range\n"); - goto out_free; - } - gdev->pintc_base = pdata->pintc_base; gdev->hostirq_start = platform_get_irq(pdev, 0);