From patchwork Tue Aug 15 15:45:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 110179 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp5832319qge; Tue, 15 Aug 2017 08:46:56 -0700 (PDT) X-Received: by 10.98.1.199 with SMTP id 190mr22546112pfb.178.1502812016633; Tue, 15 Aug 2017 08:46:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502812016; cv=none; d=google.com; s=arc-20160816; b=GUlN43OU0epAJHIQl8519eWFkM4zmFdKzI2iMEt62SPllw5bkmm0ZjiQBtisfiyxBn h4QSsnBkzGBw4IT0N7rCqSh8b1FShaS8STwCBJNudtXUEb8Qc+nyXmhzZHEwkpWr7MEG CX08t/etTXPESri3i67JRtlJwZqbwmO9oRd9Qs1svruNP75p7i/GF+Y5PRPz/33aAS4F 91RfcM2VBRjs1THQ4Aa6CR6eLn+IStCCyGtDZO7uzYD7pgEjbeCZycjMI5Qcvd9MlXCr lzNEQdKm2iGZVllnq8/qEfdb2GtNEdXXybCnNRsF+VzU85noQBTIU0yj9UnQI3aha58G /R/A== 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=Ym29MgmG+ItgMCVC21yAxLcC2hRtUaf+V+tio8RVNaY=; b=yVq+0Ue8MqoOdoWIzdcjpMGFwKQ56G7cmdrAmtxU/SVKtvkWeLT8WqOOcAFHc9oEOC 1ifUDDSBtxmDPprspEnAjw7xhcmynJlI4bUyu16bp6OSmxm7XkvcIim2lVnT8Bq9V7f5 GAzMwtGH1HGHc5C6apMbOO9jibg4CO7lnbimYQs2qx3Ca95DuomZbjnL4u0/3y4M/U3R tIrK0O7ldutVWpHtSHfaDj3FcJxuN3XavNskRcYF0u4hWpwDda04NNdlqvplb+gIS9Zw 2aFbh7XMmOHfQ3m9ByWgiXe7NXKzxQ+Dc557RspRtGL+dsbY0TqDdtHbLnxL2Pw1DxUh u1RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=gbOgBhKF; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-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 94si6447668ple.611.2017.08.15.08.46.56; Tue, 15 Aug 2017 08:46:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=gbOgBhKF; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752545AbdHOPqy (ORCPT + 6 others); Tue, 15 Aug 2017 11:46:54 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:39963 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752450AbdHOPqx (ORCPT ); Tue, 15 Aug 2017 11:46:53 -0400 Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-08.nifty.com with ESMTP id v7FFjk9Z018213; Wed, 16 Aug 2017 00:45:48 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v7FFjk9Z018213 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1502811949; bh=0wVWzPvYZqJJVPXrup4tmjuhqM6DxeO7EktGaWYsKAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gbOgBhKFGbzwHS30l410310820Wyjm0HwMQDjYvSF7f38kp+Ig/3fb7GzsAmotfzN MyqoYbJQJSkkReo4rGynaQdCX8WfCAgT+5eT8ZF6NkQ8W3aFJ/+PY1QLS0z21pzG9H 6s6poavYkTTs+NusByBcI0co3QVEw0jb519Vd0Ghd7zZbflu5OdsOro6LBi3IzbtvM femBuJpKxIis8JPd5J/TaOom+Kx2iei/xPhQmXnKnQ+d9/ZxBqFpBzD9psFowo3bBD 3lG5pjvmh6Dx+qiEjk2OoVrAHyWM+tM3DIu7cIZeJx5Tb0v5d439AhkGXotPH7sJsK IJaUgkJxWQGwA== X-Nifty-SrcIP: [122.131.185.176] 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 v3 2/4] mmc: sdhci-pxav2: switch to managed clk and sdhci_pltfm_unregister() Date: Wed, 16 Aug 2017 00:45:20 +0900 Message-Id: <1502811922-9346-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502811922-9346-1-git-send-email-yamada.masahiro@socionext.com> References: <1502811922-9346-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Adrian Hunter 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);