On Wed, 22 Jan 2014 13:57:39 +0800, Xiubo Li <li.xi...@freescale.com> wrote:
> There two places will use the same code for adding one new property to
> the DT node. Adding __of_add_property() and prepare for fixing
> of_update_property()'s bug.
>
> Signed-off-by: Xiubo Li <li.xi...@freescale.com>
Applied, thanks.
g.
> ---
> drivers/of/base.c | 38 ++++++++++++++++++++++++--------------
> 1 file changed, 24 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index f807d0e..b86b77a 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -1469,11 +1469,31 @@ static int of_property_notify(int action, struct
> device_node *np,
> #endif
>
> /**
> + * __of_add_property - Add a property to a node without lock operations
> + */
> +static int __of_add_property(struct device_node *np, struct property *prop)
> +{
> + struct property **next;
> +
> + prop->next = NULL;
> + next = &np->properties;
> + while (*next) {
> + if (strcmp(prop->name, (*next)->name) == 0)
> + /* duplicate ! don't insert it */
> + return -EEXIST;
> +
> + next = &(*next)->next;
> + }
> + *next = prop;
> +
> + return 0;
> +}
> +
> +/**
> * of_add_property - Add a property to a node
> */
> int of_add_property(struct device_node *np, struct property *prop)
> {
> - struct property **next;
> unsigned long flags;
> int rc;
>
> @@ -1481,27 +1501,17 @@ int of_add_property(struct device_node *np, struct
> property *prop)
> if (rc)
> return rc;
>
> - prop->next = NULL;
> raw_spin_lock_irqsave(&devtree_lock, flags);
> - next = &np->properties;
> - while (*next) {
> - if (strcmp(prop->name, (*next)->name) == 0) {
> - /* duplicate ! don't insert it */
> - raw_spin_unlock_irqrestore(&devtree_lock, flags);
> - return -1;
> - }
> - next = &(*next)->next;
> - }
> - *next = prop;
> + rc = __of_add_property(np, prop);
> raw_spin_unlock_irqrestore(&devtree_lock, flags);
>
> #ifdef CONFIG_PROC_DEVICETREE
> /* try to add to proc as well if it was initialized */
> - if (np->pde)
> + if (!rc && np->pde)
> proc_device_tree_add_prop(np->pde, prop);
> #endif /* CONFIG_PROC_DEVICETREE */
>
> - return 0;
> + return rc;
> }
>
> /**
> --
> 1.8.4
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
