Commit bbed8794 authored by Frank Rowand's avatar Frank Rowand Committed by Rob Herring

of: overlay.c: Convert comparisons to zero or NULL to logical expressions

Use normal shorthand for comparing a variable to zero.
For variable "XXX":
   convert (XXX == 0) to (!XXX)
   convert (XXX != 0) to (XXX)
Signed-off-by: default avatarFrank Rowand <frank.rowand@sony.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 646afc4a
...@@ -169,9 +169,9 @@ static int of_overlay_apply_single_property(struct of_overlay *ov, ...@@ -169,9 +169,9 @@ static int of_overlay_apply_single_property(struct of_overlay *ov,
tprop = of_find_property(target, prop->name, NULL); tprop = of_find_property(target, prop->name, NULL);
if (of_prop_cmp(prop->name, "name") == 0 || if (!of_prop_cmp(prop->name, "name") ||
of_prop_cmp(prop->name, "phandle") == 0 || !of_prop_cmp(prop->name, "phandle") ||
of_prop_cmp(prop->name, "linux,phandle") == 0) !of_prop_cmp(prop->name, "linux,phandle"))
return 0; return 0;
if (is_symbols_node) { if (is_symbols_node) {
...@@ -182,10 +182,10 @@ static int of_overlay_apply_single_property(struct of_overlay *ov, ...@@ -182,10 +182,10 @@ static int of_overlay_apply_single_property(struct of_overlay *ov,
propn = __of_prop_dup(prop, GFP_KERNEL); propn = __of_prop_dup(prop, GFP_KERNEL);
} }
if (propn == NULL) if (!propn)
return -ENOMEM; return -ENOMEM;
if (tprop == NULL) if (!tprop)
ret = of_changeset_add_property(&ov->cset, target, propn); ret = of_changeset_add_property(&ov->cset, target, propn);
else else
ret = of_changeset_update_property(&ov->cset, target, propn); ret = of_changeset_update_property(&ov->cset, target, propn);
...@@ -206,14 +206,14 @@ static int of_overlay_apply_single_device_node(struct of_overlay *ov, ...@@ -206,14 +206,14 @@ static int of_overlay_apply_single_device_node(struct of_overlay *ov,
int ret = 0; int ret = 0;
cname = kbasename(child->full_name); cname = kbasename(child->full_name);
if (cname == NULL) if (!cname)
return -ENOMEM; return -ENOMEM;
for_each_child_of_node(target, tchild) for_each_child_of_node(target, tchild)
if (!of_node_cmp(cname, kbasename(tchild->full_name))) if (!of_node_cmp(cname, kbasename(tchild->full_name)))
break; break;
if (tchild != NULL) { if (tchild) {
if (child->phandle) if (child->phandle)
return -EINVAL; return -EINVAL;
...@@ -271,7 +271,7 @@ static int of_overlay_apply_one(struct of_overlay *ov, ...@@ -271,7 +271,7 @@ static int of_overlay_apply_one(struct of_overlay *ov,
for_each_child_of_node(overlay, child) { for_each_child_of_node(overlay, child) {
ret = of_overlay_apply_single_device_node(ov, target, child); ret = of_overlay_apply_single_device_node(ov, target, child);
if (ret != 0) { if (ret) {
pr_err("Failed to apply single node @%pOF/%s\n", pr_err("Failed to apply single node @%pOF/%s\n",
target, child->name); target, child->name);
of_node_put(child); of_node_put(child);
...@@ -300,7 +300,7 @@ static int of_overlay_apply(struct of_overlay *ov) ...@@ -300,7 +300,7 @@ static int of_overlay_apply(struct of_overlay *ov)
err = of_overlay_apply_one(ov, ovinfo->target, ovinfo->overlay, err = of_overlay_apply_one(ov, ovinfo->target, ovinfo->overlay,
ovinfo->is_symbols_node); ovinfo->is_symbols_node);
if (err != 0) { if (err) {
pr_err("apply failed '%pOF'\n", ovinfo->target); pr_err("apply failed '%pOF'\n", ovinfo->target);
return err; return err;
} }
...@@ -323,11 +323,11 @@ static struct device_node *find_target_node(struct device_node *info_node) ...@@ -323,11 +323,11 @@ static struct device_node *find_target_node(struct device_node *info_node)
int ret; int ret;
ret = of_property_read_u32(info_node, "target", &val); ret = of_property_read_u32(info_node, "target", &val);
if (ret == 0) if (!ret)
return of_find_node_by_phandle(val); return of_find_node_by_phandle(val);
ret = of_property_read_string(info_node, "target-path", &path); ret = of_property_read_string(info_node, "target-path", &path);
if (ret == 0) if (!ret)
return of_find_node_by_path(path); return of_find_node_by_path(path);
pr_err("Failed to find target for node %p (%s)\n", pr_err("Failed to find target for node %p (%s)\n",
...@@ -354,11 +354,11 @@ static int of_fill_overlay_info(struct of_overlay *ov, ...@@ -354,11 +354,11 @@ static int of_fill_overlay_info(struct of_overlay *ov,
struct device_node *info_node, struct of_overlay_info *ovinfo) struct device_node *info_node, struct of_overlay_info *ovinfo)
{ {
ovinfo->overlay = of_get_child_by_name(info_node, "__overlay__"); ovinfo->overlay = of_get_child_by_name(info_node, "__overlay__");
if (ovinfo->overlay == NULL) if (!ovinfo->overlay)
goto err_fail; goto err_fail;
ovinfo->target = find_target_node(info_node); ovinfo->target = find_target_node(info_node);
if (ovinfo->target == NULL) if (!ovinfo->target)
goto err_fail; goto err_fail;
return 0; return 0;
...@@ -398,13 +398,13 @@ static int of_build_overlay_info(struct of_overlay *ov, ...@@ -398,13 +398,13 @@ static int of_build_overlay_info(struct of_overlay *ov,
cnt++; cnt++;
ovinfo = kcalloc(cnt, sizeof(*ovinfo), GFP_KERNEL); ovinfo = kcalloc(cnt, sizeof(*ovinfo), GFP_KERNEL);
if (ovinfo == NULL) if (!ovinfo)
return -ENOMEM; return -ENOMEM;
cnt = 0; cnt = 0;
for_each_child_of_node(tree, node) { for_each_child_of_node(tree, node) {
err = of_fill_overlay_info(ov, node, &ovinfo[cnt]); err = of_fill_overlay_info(ov, node, &ovinfo[cnt]);
if (err == 0) if (!err)
cnt++; cnt++;
} }
...@@ -422,7 +422,7 @@ static int of_build_overlay_info(struct of_overlay *ov, ...@@ -422,7 +422,7 @@ static int of_build_overlay_info(struct of_overlay *ov,
cnt++; cnt++;
} }
if (cnt == 0) { if (!cnt) {
kfree(ovinfo); kfree(ovinfo);
return -ENODEV; return -ENODEV;
} }
...@@ -478,7 +478,7 @@ int of_overlay_create(struct device_node *tree) ...@@ -478,7 +478,7 @@ int of_overlay_create(struct device_node *tree)
int err, id; int err, id;
ov = kzalloc(sizeof(*ov), GFP_KERNEL); ov = kzalloc(sizeof(*ov), GFP_KERNEL);
if (ov == NULL) if (!ov)
return -ENOMEM; return -ENOMEM;
ov->id = -1; ov->id = -1;
...@@ -629,7 +629,7 @@ int of_overlay_destroy(int id) ...@@ -629,7 +629,7 @@ int of_overlay_destroy(int id)
mutex_lock(&of_mutex); mutex_lock(&of_mutex);
ov = idr_find(&ov_idr, id); ov = idr_find(&ov_idr, id);
if (ov == NULL) { if (!ov) {
err = -ENODEV; err = -ENODEV;
pr_err("destroy: Could not find overlay #%d\n", id); pr_err("destroy: Could not find overlay #%d\n", id);
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment