From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Hesselbarth Subject: [PATCH RESEND 06/12] mmc: sdhci-pxav3: Move I/O clock to private data Date: Tue, 21 Oct 2014 11:22:38 +0200 Message-ID: <1413883364-681-7-git-send-email-sebastian.hesselbarth@gmail.com> References: <1413883364-681-1-git-send-email-sebastian.hesselbarth@gmail.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1413883364-681-1-git-send-email-sebastian.hesselbarth@gmail.com> Sender: linux-mmc-owner@vger.kernel.org To: Sebastian Hesselbarth Cc: Chris Ball , Ulf Hansson , =?UTF-8?q?Antoine=20T=C3=A9nart?= , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org List-Id: devicetree@vger.kernel.org As we are using references to the I/O clock throughout the driver, move it to the private data. Also, in preparation for core clock, rename it to clk_io. Signed-off-by: Sebastian Hesselbarth --- Cc: Chris Ball Cc: Ulf Hansson Cc: "Antoine T=C3=A9nart" Cc: linux-mmc@vger.kernel.org Cc: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/mmc/host/sdhci-pxav3.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-px= av3.c index e52bbbb09d88..a34a589670e6 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -59,6 +59,7 @@ #define SDCE_MISC_INT_EN (1<<1) =20 struct sdhci_pxa { + struct clk *clk_io; u8 power_mode; }; =20 @@ -288,9 +289,7 @@ static int sdhci_pxav3_probe(struct platform_device= *pdev) struct sdhci_host *host =3D NULL; struct sdhci_pxa *pxa =3D NULL; const struct of_device_id *match; - int ret; - struct clk *clk; =20 pxa =3D devm_kzalloc(&pdev->dev, sizeof(struct sdhci_pxa), GFP_KERNEL= ); if (!pxa) @@ -310,14 +309,14 @@ static int sdhci_pxav3_probe(struct platform_devi= ce *pdev) pltfm_host =3D sdhci_priv(host); pltfm_host->priv =3D pxa; =20 - clk =3D devm_clk_get(dev, NULL); - if (IS_ERR(clk)) { + pxa->clk_io =3D devm_clk_get(dev, NULL); + if (IS_ERR(pxa->clk_io)) { dev_err(dev, "failed to get io clock\n"); - ret =3D PTR_ERR(clk); + ret =3D PTR_ERR(pxa->clk_io); goto err_clk_get; } - pltfm_host->clk =3D clk; - clk_prepare_enable(clk); + pltfm_host->clk =3D pxa->clk_io; + clk_prepare_enable(pxa->clk_io); =20 /* enable 1/8V DDR capable */ host->mmc->caps |=3D MMC_CAP_1_8V_DDR; @@ -390,7 +389,7 @@ err_add_host: pm_runtime_disable(&pdev->dev); err_of_parse: err_cd_req: - clk_disable_unprepare(clk); + clk_disable_unprepare(pxa->clk_io); err_clk_get: err_mbus_win: sdhci_pltfm_free(pdev); @@ -401,12 +400,13 @@ static int sdhci_pxav3_remove(struct platform_dev= ice *pdev) { struct sdhci_host *host =3D platform_get_drvdata(pdev); struct sdhci_pltfm_host *pltfm_host =3D sdhci_priv(host); + struct sdhci_pxa *pxa =3D pltfm_host->priv; =20 pm_runtime_get_sync(&pdev->dev); sdhci_remove_host(host, 1); pm_runtime_disable(&pdev->dev); =20 - clk_disable_unprepare(pltfm_host->clk); + clk_disable_unprepare(pxa->clk_io); =20 sdhci_pltfm_free(pdev); =20 @@ -446,13 +446,14 @@ static int sdhci_pxav3_runtime_suspend(struct dev= ice *dev) { struct sdhci_host *host =3D dev_get_drvdata(dev); struct sdhci_pltfm_host *pltfm_host =3D sdhci_priv(host); + struct sdhci_pxa *pxa =3D pltfm_host->priv; unsigned long flags; =20 spin_lock_irqsave(&host->lock, flags); host->runtime_suspended =3D true; spin_unlock_irqrestore(&host->lock, flags); =20 - clk_disable_unprepare(pltfm_host->clk); + clk_disable_unprepare(pxa->clk_io); =20 return 0; } @@ -461,9 +462,10 @@ static int sdhci_pxav3_runtime_resume(struct devic= e *dev) { struct sdhci_host *host =3D dev_get_drvdata(dev); struct sdhci_pltfm_host *pltfm_host =3D sdhci_priv(host); + struct sdhci_pxa *pxa =3D pltfm_host->priv; unsigned long flags; =20 - clk_prepare_enable(pltfm_host->clk); + clk_prepare_enable(pxa->clk_io); =20 spin_lock_irqsave(&host->lock, flags); host->runtime_suspended =3D false; --=20 2.1.1