From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH RESEND 05/12] mmc: sdhci-pxav3: Remove checks for mandatory host clock
Date: Tue, 21 Oct 2014 11:22:37 +0200 [thread overview]
Message-ID: <1413883364-681-6-git-send-email-sebastian.hesselbarth@gmail.com> (raw)
In-Reply-To: <1413883364-681-1-git-send-email-sebastian.hesselbarth@gmail.com>
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@gmail.com>
---
Cc: Chris Ball <chris@printf.net>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: "Antoine T?nart" <antoine.tenart@free-electrons.com>
Cc: linux-mmc at vger.kernel.org
Cc: devicetree at vger.kernel.org
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
---
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
next prev parent reply other threads:[~2014-10-21 9:22 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-21 9:22 [PATCH RESEND 00/12] SDHCI PXA cleanup and clocks Sebastian Hesselbarth
2014-10-21 9:22 ` [PATCH RESEND 01/12] mmc: sdhci-pxav2: Drop unused struct sdhci_pxa Sebastian Hesselbarth
2014-10-27 13:38 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 02/12] mmc: sdhci-pxav3: Respect MMC_DDR52 timing on uhs signaling Sebastian Hesselbarth
2014-10-27 13:38 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 03/12] mmc: sdhci-pxav3: Move private driver data to driver source Sebastian Hesselbarth
2014-10-27 13:39 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 04/12] mmc: sdhci-pxav3: Remove unused clk_enable from sdhci_pxa Sebastian Hesselbarth
2014-10-27 13:39 ` Ulf Hansson
2014-10-21 9:22 ` Sebastian Hesselbarth [this message]
2014-10-27 13:39 ` [PATCH RESEND 05/12] mmc: sdhci-pxav3: Remove checks for mandatory host clock Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 06/12] mmc: sdhci-pxav3: Move I/O clock to private data Sebastian Hesselbarth
2014-10-27 13:28 ` Ulf Hansson
2014-10-27 18:15 ` Sebastian Hesselbarth
2014-10-28 9:52 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 07/12] mmc: sdhci-pxav3: Try to get named I/O clock first Sebastian Hesselbarth
2014-10-28 9:53 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 08/12] mmc: sdhci-pxav3: Get optional core clock Sebastian Hesselbarth
2014-10-28 9:53 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 09/12] mmc: sdhci-pxav3: Document clocks and additional clock-names property Sebastian Hesselbarth
2014-10-28 9:53 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 10/12] ARM: dts: berlin: Add SDHCI controller nodes to BG2/BG2CD Sebastian Hesselbarth
2014-10-29 18:39 ` Sebastian Hesselbarth
2014-10-21 9:22 ` [PATCH RESEND 11/12] ARM: dts: berlin: Enable WiFi on Google Chromecast Sebastian Hesselbarth
2014-10-21 9:22 ` [PATCH RESEND 12/12] ARM: dts: berlin: Enable eMMC on Sony NSZ-GS7 Sebastian Hesselbarth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413883364-681-6-git-send-email-sebastian.hesselbarth@gmail.com \
--to=sebastian.hesselbarth@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).