From: Sebastian Hesselbarth Date: Tue, 21 Oct 2014 09:22:37 +0000 (+0200) Subject: mmc: sdhci-pxav3: Remove checks for mandatory host clock X-Git-Tag: v3.16.35~2776 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8aaf37277387c2685ded995cb42a2edc6d5d0f16;p=thirdparty%2Fkernel%2Fstable.git mmc: sdhci-pxav3: Remove checks for mandatory host clock commit 20d5a70344e526f51efe50861be10f6d743b7706 upstream. NULL-checking a struct clk it not only wrong but also not required as for PXAv3 driver the corresponding clock is mandatory. Remove the checks from sdhci_pxav3_runtime_{suspend,resume}. Signed-off-by: Sebastian Hesselbarth Signed-off-by: Ulf Hansson Signed-off-by: Luis Henriques --- diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 81143e57b2ffa..f62655bc1604f 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -450,13 +450,11 @@ static int sdhci_pxav3_runtime_suspend(struct device *dev) struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); unsigned long flags; - if (pltfm_host->clk) { - spin_lock_irqsave(&host->lock, flags); - host->runtime_suspended = true; - spin_unlock_irqrestore(&host->lock, flags); + spin_lock_irqsave(&host->lock, flags); + host->runtime_suspended = true; + spin_unlock_irqrestore(&host->lock, flags); - clk_disable_unprepare(pltfm_host->clk); - } + clk_disable_unprepare(pltfm_host->clk); return 0; } @@ -467,13 +465,11 @@ static int sdhci_pxav3_runtime_resume(struct device *dev) struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); unsigned long flags; - if (pltfm_host->clk) { - clk_prepare_enable(pltfm_host->clk); + clk_prepare_enable(pltfm_host->clk); - spin_lock_irqsave(&host->lock, flags); - host->runtime_suspended = false; - spin_unlock_irqrestore(&host->lock, flags); - } + spin_lock_irqsave(&host->lock, flags); + host->runtime_suspended = false; + spin_unlock_irqrestore(&host->lock, flags); return 0; }