Re: [PATCH] of: Clean up of_update_property

[Rob Herring]

On Tue, Apr 15, 2014 at 10:38 AM, Guenter Roeck <linux@xxxxxxxxxxxx> wrote:
> After searching for the old property, bail out with -ENODEV
> if it was not found.
>
> It is unnecessary to check if oldprop is NULL before removing
> its binary file; the check was already done before.
>
> Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>

Applied. Thanks.

Rob

> ---
>  drivers/of/base.c |   10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index f72d19b..6d4ee22 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -1828,17 +1828,13 @@ int of_update_property(struct device_node *np, struct property *newprop)
>                 next = &(*next)->next;
>         }
>         raw_spin_unlock_irqrestore(&devtree_lock, flags);
> -       if (rc)
> -               return rc;
> +       if (!found)
> +               return -ENODEV;
>
>         /* Update the sysfs attribute */
> -       if (oldprop)
> -               sysfs_remove_bin_file(&np->kobj, &oldprop->attr);
> +       sysfs_remove_bin_file(&np->kobj, &oldprop->attr);
>         __of_add_property_sysfs(np, newprop);
>
> -       if (!found)
> -               return -ENODEV;
> -
>         return 0;
>  }
>
> --
> 1.7.9.7
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/