On 21 October 2014 11:22, Sebastian Hesselbarth
<sebastian.hesselbarth@xxxxxxxxx> wrote:
> 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 <sebastian.hesselbarth@xxxxxxxxx>
Thanks! Applied for next!
Kind regards
Uffe
> ---
> Cc: Chris Ball <chris@xxxxxxxxxx>
> Cc: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
> Cc: "Antoine Ténart" <antoine.tenart@xxxxxxxxxxxxxxxxxx>
> Cc: linux-mmc@xxxxxxxxxxxxxxx
> Cc: devicetree@xxxxxxxxxxxxxxx
> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> ---
> drivers/mmc/host/sdhci-pxav3.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
> index d1f63d32b2cd..e52bbbb09d88 100644
> --- a/drivers/mmc/host/sdhci-pxav3.c
> +++ b/drivers/mmc/host/sdhci-pxav3.c
> @@ -448,13 +448,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;
> }
> @@ -465,13 +463,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;
> }
> --
> 2.1.1
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
