From patchwork Wed Aug 23 04:15:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 110708 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp3588356qge; Tue, 22 Aug 2017 21:17:06 -0700 (PDT) X-Received: by 10.101.77.11 with SMTP id i11mr1353993pgt.163.1503461826851; Tue, 22 Aug 2017 21:17:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503461826; cv=none; d=google.com; s=arc-20160816; b=FQc9uvD6URtfaepXrpYYfxO/Nc27yMKYpd8tryqOTBZJx87o0nujRvxWVL9IoKgO/e Mfme1K4Y9+1tCRO/5vZamKk0TEuehMG09DX+dsRR852nYj3pxxqrEDqUriJpvIG1SIVS JgL2hRd8Er/Vc0dqUX5aJmX33b/saZCy0giAAJCZ+Br2jXpw1TxYem2NqC97ukGSFKjC VHTrJhBFlKd3UXjafLb2m5K1zgbA5tvbI860B4b9eBzbLcr1ACn7NOGma4/k712JKYra SBai28si+eeQaOlxdu9tIigzzQ/o8MoYKavXZ+eMrCIeUvQAFvO37ecBFNwOa4C3fp4m TikQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=iQ7PsePFyhFvI5AHZQHHkmtsVHO9IjvMk8I+T0y3p/U=; b=sCEIIIpM5RAJEjyq7KaOm4uJlDBaEjbHvuA2xcDhyzCAsSmrGBqAqwtBPoQlpwo93P hYps1rpZxlzWv1R97l3PMwhzH8OZpWkS0jA79OmbucNso/1EF22OljgCh0B9VqEKM/Oz GBICMTg0Q2flKXIY9cfdD95W5jsntInjuFYRG0K4lQDdo1uOtB0h8g/hvuIc8SszeLGr ndIYwm09uu0rXiXdoeLg7SIozFAMLdykH/PwPPbu/cahICFh3qmdCNFbceHWmYjRI/xE UYZZXGa492YV2QN7p6pmoCnLlictQB18WOhp1CjXO/cxCUO497Wsi+zej4x+eg+4vt3G 7k3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=gqtIaFv6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q2si395817pgn.704.2017.08.22.21.17.06; Tue, 22 Aug 2017 21:17:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=gqtIaFv6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753311AbdHWERD (ORCPT + 26 others); Wed, 23 Aug 2017 00:17:03 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:19344 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753236AbdHWERA (ORCPT ); Wed, 23 Aug 2017 00:17:00 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id v7N4F6Rr020925; Wed, 23 Aug 2017 13:15:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v7N4F6Rr020925 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1503461710; bh=iQ7PsePFyhFvI5AHZQHHkmtsVHO9IjvMk8I+T0y3p/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gqtIaFv60tvEtJxlnBxV54w4yuCAQNHThd+PDi25t3IQ7ojhTFaxShO1h6QXmR+t5 bDiSIbmcAgZMy1uRs7Mbdr+9c2wzyxERJJOlKdMP4aZAbZ6AwEgD2LexLOe9qtp/T5 pkWQV04ZvOlsXzPyc97KSa2CdKqusRdOuahk3kbCTN1Q1lb4WCkfR916ZSixt6whl2 L4LliUezhyy21pD+YMiSO7AA0XZU3IbFMs6HvEECUBfAUsfjuqw5GNkYF4A9vWR+Nk BVdOPsL7RYbOhLq+fPyaMg8q0zW8wlMAsp6P5GLUfOR7GBF+ZxsTzI130GD6C6v4mt 54YQKsNuMmfkg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mmc@vger.kernel.org Cc: Piotr Sroka , Hu Ziji , Adrian Hunter , Christian Daudt , Scott Branden , Zhangfei Gao , Kevin Hao , Olof Johansson , Masahiro Yamada , linux-kernel@vger.kernel.org, Ulf Hansson Subject: [PATCH v4 2/4] mmc: sdhci-pxav2: switch to managed clk and sdhci_pltfm_unregister() Date: Wed, 23 Aug 2017 13:15:01 +0900 Message-Id: <1503461703-16225-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503461703-16225-1-git-send-email-yamada.masahiro@socionext.com> References: <1503461703-16225-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The difference between sdhci_pxav2_remove() and sdhci_pltfm_unregister() is clk_put(). It will go away by using the managed resource clk, then sdhci_pltfm_unregister() can be reused. Also, rename the jump labels to say what the goto does. (Coding style suggested by Documentation/process/coding-style.rst) Signed-off-by: Masahiro Yamada Acked-by: Adrian Hunter --- Changes in v4: None Changes in v3: - Newly added Changes in v2: None drivers/mmc/host/sdhci-pxav2.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) -- 2.7.4 diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c index 995083ce1c46..8986f9d9cf98 100644 --- a/drivers/mmc/host/sdhci-pxav2.c +++ b/drivers/mmc/host/sdhci-pxav2.c @@ -178,17 +178,17 @@ static int sdhci_pxav2_probe(struct platform_device *pdev) pltfm_host = sdhci_priv(host); - clk = clk_get(dev, "PXA-SDHCLK"); + clk = devm_clk_get(dev, "PXA-SDHCLK"); if (IS_ERR(clk)) { dev_err(dev, "failed to get io clock\n"); ret = PTR_ERR(clk); - goto err_clk_get; + goto free; } pltfm_host->clk = clk; ret = clk_prepare_enable(clk); if (ret) { dev_err(&pdev->dev, "failed to enable io clock\n"); - goto err_clk_enable; + goto free; } host->quirks = SDHCI_QUIRK_BROKEN_ADMA @@ -223,34 +223,18 @@ static int sdhci_pxav2_probe(struct platform_device *pdev) ret = sdhci_add_host(host); if (ret) { dev_err(&pdev->dev, "failed to add host\n"); - goto err_add_host; + goto disable_clk; } return 0; -err_add_host: +disable_clk: clk_disable_unprepare(clk); -err_clk_enable: - clk_put(clk); -err_clk_get: +free: sdhci_pltfm_free(pdev); return ret; } -static int sdhci_pxav2_remove(struct platform_device *pdev) -{ - struct sdhci_host *host = platform_get_drvdata(pdev); - struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - - sdhci_remove_host(host, 1); - - clk_disable_unprepare(pltfm_host->clk); - clk_put(pltfm_host->clk); - sdhci_pltfm_free(pdev); - - return 0; -} - static struct platform_driver sdhci_pxav2_driver = { .driver = { .name = "sdhci-pxav2", @@ -258,7 +242,7 @@ static struct platform_driver sdhci_pxav2_driver = { .pm = &sdhci_pltfm_pmops, }, .probe = sdhci_pxav2_probe, - .remove = sdhci_pxav2_remove, + .remove = sdhci_pltfm_unregister, }; module_platform_driver(sdhci_pxav2_driver);