| Message ID | 1995139bee5248ff3e9d46dc715968f212cfc4cc.1570520268.git.baolin.wang@linaro.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [v2,1/2] clk: sprd: Use IS_ERR() to validate the return value of syscon_regmap_lookup_by_phandle() | expand |
Hi Stephen, On Tue, 8 Oct 2019 at 15:41, Baolin Wang <baolin.wang@linaro.org> wrote: > > The syscon_regmap_lookup_by_phandle() will never return NULL, thus use > IS_ERR() to validate the return value instead of IS_ERR_OR_NULL(). > > Fixes: d41f59fd92f2 ("clk: sprd: Add common infrastructure") > Signed-off-by: Baolin Wang <baolin.wang@linaro.org> > --- > Changes from v1: > - Add fixes tag. > --- I did not see this patch in your clk tree (you only applied patch 2 in this patch set), could you apply this patch if no other issues? Thanks. > drivers/clk/sprd/common.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clk/sprd/common.c b/drivers/clk/sprd/common.c > index 9d56eac..7ad5ba2 100644 > --- a/drivers/clk/sprd/common.c > +++ b/drivers/clk/sprd/common.c > @@ -46,7 +46,7 @@ int sprd_clk_regmap_init(struct platform_device *pdev, > > if (of_find_property(node, "sprd,syscon", NULL)) { > regmap = syscon_regmap_lookup_by_phandle(node, "sprd,syscon"); > - if (IS_ERR_OR_NULL(regmap)) { > + if (IS_ERR(regmap)) { > pr_err("%s: failed to get syscon regmap\n", __func__); > return PTR_ERR(regmap); > } > -- > 1.7.9.5 >
Quoting Baolin Wang (2019-10-08 00:41:38) > The syscon_regmap_lookup_by_phandle() will never return NULL, thus use > IS_ERR() to validate the return value instead of IS_ERR_OR_NULL(). > > Fixes: d41f59fd92f2 ("clk: sprd: Add common infrastructure") > Signed-off-by: Baolin Wang <baolin.wang@linaro.org> > --- Applied to clk-next
diff --git a/drivers/clk/sprd/common.c b/drivers/clk/sprd/common.c index 9d56eac..7ad5ba2 100644 --- a/drivers/clk/sprd/common.c +++ b/drivers/clk/sprd/common.c @@ -46,7 +46,7 @@ int sprd_clk_regmap_init(struct platform_device *pdev, if (of_find_property(node, "sprd,syscon", NULL)) { regmap = syscon_regmap_lookup_by_phandle(node, "sprd,syscon"); - if (IS_ERR_OR_NULL(regmap)) { + if (IS_ERR(regmap)) { pr_err("%s: failed to get syscon regmap\n", __func__); return PTR_ERR(regmap); }
The syscon_regmap_lookup_by_phandle() will never return NULL, thus use IS_ERR() to validate the return value instead of IS_ERR_OR_NULL(). Fixes: d41f59fd92f2 ("clk: sprd: Add common infrastructure") Signed-off-by: Baolin Wang <baolin.wang@linaro.org> --- Changes from v1: - Add fixes tag. --- drivers/clk/sprd/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)