From patchwork Thu Nov 20 14:45:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: lautriv X-Patchwork-Id: 5348621 Return-Path: X-Original-To: patchwork-linux-mmc@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 63E02C11AC for ; Thu, 20 Nov 2014 14:45:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 76009201ED for ; Thu, 20 Nov 2014 14:45:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 86EED201B9 for ; Thu, 20 Nov 2014 14:45:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756896AbaKTOpi (ORCPT ); Thu, 20 Nov 2014 09:45:38 -0500 Received: from coldplug.net ([109.75.184.172]:46501 "EHLO external.coldplug.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756725AbaKTOpJ (ORCPT ); Thu, 20 Nov 2014 09:45:09 -0500 Received: from localhost (localhost [127.0.0.1]) by external.coldplug.net (Postfix) with ESMTP id 8C9373A548 for ; Thu, 20 Nov 2014 15:45:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=coldplug.net; h= content-transfer-encoding:content-type:content-type:in-reply-to :references:subject:subject:to:mime-version:user-agent:from:from :date:date:message-id; s=dkim; t=1416494705; x=1417358705; bh=s8 pGIbJsgFtvD1YSysphXIKZHOHGs2fs3mWhe5wqIwo=; b=BtmsYB+HpDlNH+81FD tR3JjLlkeqVdT0+h+lO9h6qxNL1FyzF4l7LEthINDzDtXiRGViKZdfMqzuEVx9yb P/aytyHNRFqyX8XVQ+GTlj8aMZ1+gDQ8LRMMK+ElGmgFLHqb5aNnWPAnCU1NzR84 cnThQdft2D55L1Po+9WnIriWs= X-Virus-Scanned: Debian amavisd-new at MYHOSTNAME Received: from external.coldplug.net ([127.0.0.1]) by localhost (external.coldplug.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G4Lvp0HJt5n3 for ; Thu, 20 Nov 2014 15:45:05 +0100 (CET) Received: from [10.0.0.248] (f050082016.adsl.alicedsl.de [78.50.82.16]) by external.coldplug.net (Postfix) with ESMTPSA id 56A473A34E; Thu, 20 Nov 2014 15:44:42 +0100 (CET) Message-ID: <546DFE83.8060900@coldplug.net> Date: Thu, 20 Nov 2014 15:45:23 +0100 From: lautriv User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.2.0 MIME-Version: 1.0 To: Alexey Charkov CC: Fabio Estevam , Tony Prisk , Chris Ball , Ulf Hansson , "linux-arm-kernel@lists.infradead.org" , "linux-mmc@vger.kernel.org" , linux-kernel Subject: Re: [PATCH] mmc: wmt-sdmmc: fix unmatched release_mem_region References: <1415567571-6144-1-git-send-email-alchark@gmail.com> <545FE821.5060107@coldplug.net> In-Reply-To: Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_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 From b0509e27e33326e6dccd67d8ebe67e2bdb0cfdde Mon Sep 17 00:00:00 2001 From: Helmut Stengele Date: Thu, 20 Nov 2014 15:27:40 +0100 Subject: [PATCH] mmc: wmt-sdmmc: fix unmatched release_mem_region Current code calls release_mem_region upon module unload without requesting the region first. This patch fixes it by moving to a devres-based ioremap implementation, which handles requesting and releasing memory region internally. This also makes the error/unload paths a bit simpler. Signed-off-by: Helmut Stengele --- This is a corrected patch based on the one Alexey sent for me. I sent it already but since i'm not used to send something upstream it was an attached file and obviously rejected. Patch is tested on bare-metal ( wm8850 ) and works like suspected. drivers/mmc/host/wmt-sdmmc.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c index 54181b4..bcaa0cc 100644 --- a/drivers/mmc/host/wmt-sdmmc.c +++ b/drivers/mmc/host/wmt-sdmmc.c @@ -759,6 +759,7 @@ static int wmt_mci_probe(struct platform_device *pdev) const struct wmt_mci_caps *wmt_caps; int ret; int regular_irq, dma_irq; + struct resource *res; if (!of_id || !of_id->data) { dev_err(&pdev->dev, "Controller capabilities data missing\n"); @@ -813,10 +814,11 @@ static int wmt_mci_probe(struct platform_device *pdev) if (of_get_property(np, "cd-inverted", NULL)) priv->cd_inverted = 1; - priv->sdmmc_base = of_iomap(np, 0); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + priv->sdmmc_base = devm_ioremap_resource(&pdev->dev, res); if (!priv->sdmmc_base) { dev_err(&pdev->dev, "Failed to map IO space\n"); - ret = -ENOMEM; + ret = PTR_ERR(priv->sdmmc_base); goto fail2; } @@ -826,7 +828,7 @@ static int wmt_mci_probe(struct platform_device *pdev) ret = request_irq(regular_irq, wmt_mci_regular_isr, 0, "sdmmc", priv); if (ret) { dev_err(&pdev->dev, "Register regular IRQ fail\n"); - goto fail3; + goto fail2; } ret = request_irq(dma_irq, wmt_mci_dma_isr, 0, "sdmmc", priv); @@ -869,8 +871,6 @@ fail5: free_irq(dma_irq, priv); fail4: free_irq(regular_irq, priv); -fail3: - iounmap(priv->sdmmc_base); fail2: mmc_free_host(mmc); fail1: @@ -881,7 +881,6 @@ static int wmt_mci_remove(struct platform_device *pdev) { struct mmc_host *mmc; struct wmt_mci_priv *priv; - struct resource *res; u32 reg_tmp; mmc = platform_get_drvdata(pdev); @@ -909,9 +908,6 @@ static int wmt_mci_remove(struct platform_device *pdev) clk_disable_unprepare(priv->clk_sdmmc); clk_put(priv->clk_sdmmc); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - release_mem_region(res->start, resource_size(res)); - mmc_free_host(mmc); dev_info(&pdev->dev, "WMT MCI device removed\n");