OSDN Git Service

mmc: meson-mx-sdio: Cleanup IS_ERR() checks
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 13 Oct 2017 11:20:49 +0000 (14:20 +0300)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 30 Oct 2017 10:50:31 +0000 (11:50 +0100)
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>
drivers/mmc/host/meson-mx-sdio.c

index dc30ed5..d0d921e 100644 (file)
@@ -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;