diff options
| author | Rob Herring <robh@kernel.org> | 2023-08-18 22:41:00 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2023-08-22 00:09:57 +0200 |
| commit | 6701c2c76a1ed4bb442235204820cfa24e8d5b9c (patch) | |
| tree | 868cae2fbe77c09f7bdcae1794f4bb7ba89f65ed /drivers/of/dynamic.c | |
| parent | of: dynamic: Fix race in getting old property when updating property (diff) | |
| download | linux-6701c2c76a1ed4bb442235204820cfa24e8d5b9c.tar.xz linux-6701c2c76a1ed4bb442235204820cfa24e8d5b9c.zip | |
of: dynamic: Move dead property list check into property add/update functions
The changeset code checks for a property in the deadprops list when
adding/updating a property, but of_add_property() and
of_update_property() do not. As the users of these functions are pretty
simple, they have not hit this scenario or else the property lists
would get corrupted.
With this there are 3 cases of removing a property from either deadprops
or properties lists, so add a helper to find and remove a matching
property.
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20230801-dt-changeset-fixes-v3-5-5f0410e007dd@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/of/dynamic.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index 38dc536bc64c..713910782a9d 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -564,7 +564,6 @@ static int __of_changeset_entry_notify(struct of_changeset_entry *ce, static int __of_changeset_entry_apply(struct of_changeset_entry *ce) { - struct property **propp; unsigned long flags; int ret = 0; @@ -579,15 +578,6 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce) __of_detach_node(ce->np); break; case OF_RECONFIG_ADD_PROPERTY: - /* If the property is in deadprops then it must be removed */ - for (propp = &ce->np->deadprops; *propp; propp = &(*propp)->next) { - if (*propp == ce->prop) { - *propp = ce->prop->next; - ce->prop->next = NULL; - break; - } - } - ret = __of_add_property(ce->np, ce->prop); break; case OF_RECONFIG_REMOVE_PROPERTY: @@ -595,15 +585,6 @@ static int __of_changeset_entry_apply(struct of_changeset_entry *ce) break; case OF_RECONFIG_UPDATE_PROPERTY: - /* If the property is in deadprops then it must be removed */ - for (propp = &ce->np->deadprops; *propp; propp = &(*propp)->next) { - if (*propp == ce->prop) { - *propp = ce->prop->next; - ce->prop->next = NULL; - break; - } - } - ret = __of_update_property(ce->np, ce->prop, &ce->old_prop); break; default: |