From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ulf Hansson Subject: Re: [PATCH 2/2] mmc: meson-mx-sdio: Cleanup IS_ERR() checks Date: Fri, 20 Oct 2017 12:02:46 +0200 Message-ID: References: <20171013111943.zyp5myiwb3pp56vh@mwanda> <20171013112049.rdcdqv6ooktlv5wz@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: In-Reply-To: <20171013112049.rdcdqv6ooktlv5wz@mwanda> Sender: kernel-janitors-owner@vger.kernel.org To: Dan Carpenter Cc: Carlo Caione , Carlo Caione , Kevin Hilman , "linux-mmc@vger.kernel.org" , "open list:ARM/Amlogic Meson..." , kernel-janitors@vger.kernel.org List-Id: linux-mmc@vger.kernel.org On 13 October 2017 at 13:20, Dan Carpenter wrote: > 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 Thanks, applied for next! Kind regards Uffe > --- > I really hope it doesn't become a trend on to wrap all error checks in a > WARN_ON() macro... > > 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;