From: Balaji T K <balajitk@ti.com>
To: linux-mmc@vger.kernel.org, chris@printf.net, ulf.hansson@linaro.org
Cc: linux-omap@vger.kernel.org, Balaji T K <balajitk@ti.com>
Subject: [PATCH] mmc: omap_hsmmc: use IS_ERR macro for error checking
Date: Thu, 15 May 2014 18:53:49 +0530 [thread overview]
Message-ID: <1400160229-2578-1-git-send-email-balajitk@ti.com> (raw)
In-Reply-To: <CAPDyKFqJc92kZn_Yj87q3GJWOq+jftm0UPsShAPREqkMKC5S4g@mail.gmail.com>
Debounce clock is optional, use IS_ERR macro instead of NULL pointer check.
Signed-off-by: Balaji T K <balajitk@ti.com>
---
drivers/mmc/host/omap_hsmmc.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 6b7b755..521eec3 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1155,7 +1155,7 @@ static int omap_hsmmc_switch_opcond(struct omap_hsmmc_host *host, int vdd)
/* Disable the clocks */
pm_runtime_put_sync(host->dev);
- if (host->dbclk)
+ if (!IS_ERR(host->dbclk))
clk_disable_unprepare(host->dbclk);
/* Turn the power off */
@@ -1166,7 +1166,7 @@ static int omap_hsmmc_switch_opcond(struct omap_hsmmc_host *host, int vdd)
ret = mmc_slot(host).set_power(host->dev, host->slot_id, 1,
vdd);
pm_runtime_get_sync(host->dev);
- if (host->dbclk)
+ if (!IS_ERR(host->dbclk))
clk_prepare_enable(host->dbclk);
if (ret != 0)
@@ -1947,12 +1947,8 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
/*
* MMC can still work without debounce clock.
*/
- if (IS_ERR(host->dbclk)) {
- host->dbclk = NULL;
- } else if (clk_prepare_enable(host->dbclk) != 0) {
+ if (!IS_ERR(host->dbclk) && clk_prepare_enable(host->dbclk))
dev_warn(mmc_dev(host->mmc), "Failed to enable debounce clk\n");
- host->dbclk = NULL;
- }
/* Since we do only SG emulation, we can have as many segs
* as we want. */
@@ -2103,7 +2099,7 @@ err_irq:
dma_release_channel(host->rx_chan);
pm_runtime_put_sync(host->dev);
pm_runtime_disable(host->dev);
- if (host->dbclk)
+ if (!IS_ERR(host->dbclk))
clk_disable_unprepare(host->dbclk);
err1:
mmc_free_host(mmc);
@@ -2131,7 +2127,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
pm_runtime_put_sync(host->dev);
pm_runtime_disable(host->dev);
- if (host->dbclk)
+ if (!IS_ERR(host->dbclk))
clk_disable_unprepare(host->dbclk);
omap_hsmmc_gpio_free(host->pdata);
@@ -2175,7 +2171,7 @@ static int omap_hsmmc_suspend(struct device *dev)
OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
}
- if (host->dbclk)
+ if (!IS_ERR(host->dbclk))
clk_disable_unprepare(host->dbclk);
pm_runtime_put_sync(host->dev);
@@ -2192,7 +2188,7 @@ static int omap_hsmmc_resume(struct device *dev)
pm_runtime_get_sync(host->dev);
- if (host->dbclk)
+ if (!IS_ERR(host->dbclk))
clk_prepare_enable(host->dbclk);
if (!(host->mmc->pm_flags & MMC_PM_KEEP_POWER))
--
1.7.5.4
next prev parent reply other threads:[~2014-05-15 13:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-09 16:46 [PATCH v2 0/6] mmc: omap_hsmmc: convert to use devm_* and fixes Balaji T K
2014-05-09 16:46 ` [PATCH v2 1/6] mmc: omap_hsmmc: use devm_clk_get Balaji T K
2014-05-12 8:33 ` Ulf Hansson
2014-05-12 13:33 ` Balaji T K
2014-05-12 13:50 ` Ulf Hansson
2014-05-15 13:23 ` Balaji T K [this message]
2014-05-21 10:10 ` [PATCH] mmc: omap_hsmmc: use IS_ERR macro for error checking Ulf Hansson
2014-05-15 13:25 ` [PATCH v2 1/6] mmc: omap_hsmmc: use devm_clk_get Balaji T K
2014-05-09 16:46 ` [PATCH v2 2/6] mmc: omap_hsmmc: use devm_request_irq Balaji T K
2014-05-09 16:46 ` [PATCH v2 3/6] mmc: omap_hsmmc: use devm_request_threaded_irq Balaji T K
2014-05-09 16:46 ` [PATCH v2 4/6] mmc: omap_hsmmc: use devm_ioremap_resource Balaji T K
2014-05-09 16:46 ` [PATCH v2 5/6] mmc: omap_hsmmc: fix cmd23 multiblock read/write Balaji T K
2014-05-09 16:46 ` [PATCH v2 6/6] mmc: omap_hsmmc: split omap-dma header file Balaji T K
2014-05-15 13:38 ` Balaji T K
2014-05-16 21:41 ` Tony Lindgren
2014-05-19 11:53 ` Balaji T K
2014-05-19 16:54 ` Tony Lindgren
2014-05-20 13:28 ` Balaji T K
2014-05-20 14:50 ` Tony Lindgren
2014-05-21 10:09 ` [PATCH v2 0/6] mmc: omap_hsmmc: convert to use devm_* and fixes Ulf Hansson
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=1400160229-2578-1-git-send-email-balajitk@ti.com \
--to=balajitk@ti.com \
--cc=chris@printf.net \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=ulf.hansson@linaro.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).