From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hao Subject: [PATCH 5/7] mmc: sdhci-bcm-kona: kill the "external_clk" member in driver private struct Date: Fri, 6 Feb 2015 11:15:20 +0800 Message-ID: <1423192522-6056-6-git-send-email-haokexin@gmail.com> References: <1423192522-6056-1-git-send-email-haokexin@gmail.com> Return-path: Received: from mail-yk0-f174.google.com ([209.85.160.174]:47795 "EHLO mail-yk0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754468AbbBFDPu (ORCPT ); Thu, 5 Feb 2015 22:15:50 -0500 Received: by mail-yk0-f174.google.com with SMTP id 20so2237136yks.5 for ; Thu, 05 Feb 2015 19:15:49 -0800 (PST) In-Reply-To: <1423192522-6056-1-git-send-email-haokexin@gmail.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: linux-mmc@vger.kernel.org Cc: Chris Ball , Ulf Hansson , Christian Daudt , Matt Porter , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, Kevin Hao Actually we can use the "clk" in the struct sdhci_pltfm_host. Signed-off-by: Kevin Hao --- drivers/mmc/host/sdhci-bcm-kona.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c index 34bb8f92586e..01660344e414 100644 --- a/drivers/mmc/host/sdhci-bcm-kona.c +++ b/drivers/mmc/host/sdhci-bcm-kona.c @@ -54,7 +54,6 @@ struct sdhci_bcm_kona_dev { struct mutex write_lock; /* protect back to back writes */ - struct clk *external_clk; }; @@ -265,19 +264,19 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev) } /* Get and enable the external clock */ - kona_dev->external_clk = devm_clk_get(dev, NULL); - if (IS_ERR(kona_dev->external_clk)) { + pltfm_priv->clk = devm_clk_get(dev, NULL); + if (IS_ERR(pltfm_priv->clk)) { dev_err(dev, "Failed to get external clock\n"); - ret = PTR_ERR(kona_dev->external_clk); + ret = PTR_ERR(pltfm_priv->clk); goto err_pltfm_free; } - if (clk_set_rate(kona_dev->external_clk, host->mmc->f_max) != 0) { + if (clk_set_rate(pltfm_priv->clk, host->mmc->f_max) != 0) { dev_err(dev, "Failed to set rate external clock\n"); goto err_pltfm_free; } - if (clk_prepare_enable(kona_dev->external_clk) != 0) { + if (clk_prepare_enable(pltfm_priv->clk) != 0) { dev_err(dev, "Failed to enable external clock\n"); goto err_pltfm_free; } @@ -333,7 +332,7 @@ err_reset: sdhci_bcm_kona_sd_reset(host); err_clk_disable: - clk_disable_unprepare(kona_dev->external_clk); + clk_disable_unprepare(pltfm_priv->clk); err_pltfm_free: sdhci_pltfm_free(pdev); @@ -346,12 +345,11 @@ static int sdhci_bcm_kona_remove(struct platform_device *pdev) { struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_pltfm_host *pltfm_priv = sdhci_priv(host); - struct sdhci_bcm_kona_dev *kona_dev = sdhci_pltfm_priv(pltfm_priv); int dead = (readl(host->ioaddr + SDHCI_INT_STATUS) == 0xffffffff); sdhci_remove_host(host, dead); - clk_disable_unprepare(kona_dev->external_clk); + clk_disable_unprepare(pltfm_priv->clk); sdhci_pltfm_free(pdev); -- 1.9.3