summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-10-13 14:20:49 +0300
committerUlf Hansson <ulf.hansson@linaro.org>2017-10-30 11:50:31 +0100
commit2f129d39adb37899dec2c872bea0a6d1034f4325 (patch)
tree81504ddae71c3373d92e9e36eaeb7f591cfe42ba /drivers/mmc
parent7599b8493292ae28295127f617148b1c7394c27d (diff)
downloadlinux-2f129d39adb37899dec2c872bea0a6d1034f4325.tar.bz2
mmc: meson-mx-sdio: Cleanup IS_ERR() checks
Using PTR_ERR_OR_ZERO() instead of IS_ERR() works, but it's not how you're supposed to write these conditions. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/meson-mx-sdio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/meson-mx-sdio.c b/drivers/mmc/host/meson-mx-sdio.c
index dc30ed5e964b..d0d921e0e589 100644
--- a/drivers/mmc/host/meson-mx-sdio.c
+++ b/drivers/mmc/host/meson-mx-sdio.c
@@ -602,7 +602,7 @@ static int meson_mx_mmc_register_clks(struct meson_mx_mmc_host *host)
host->fixed_factor_clk = devm_clk_register(host->controller_dev,
&host->fixed_factor.hw);
- if (WARN_ON(PTR_ERR_OR_ZERO(host->fixed_factor_clk)))
+ if (WARN_ON(IS_ERR(host->fixed_factor_clk)))
return PTR_ERR(host->fixed_factor_clk);
clk_div_parent = __clk_get_name(host->fixed_factor_clk);
@@ -620,7 +620,7 @@ static int meson_mx_mmc_register_clks(struct meson_mx_mmc_host *host)
host->cfg_div_clk = devm_clk_register(host->controller_dev,
&host->cfg_div.hw);
- if (WARN_ON(PTR_ERR_OR_ZERO(host->cfg_div_clk)))
+ if (WARN_ON(IS_ERR(host->cfg_div_clk)))
return PTR_ERR(host->cfg_div_clk);
return 0;