| Message ID | 1446642770-4681-50-git-send-email-gwshan@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Wed, Nov 4, 2015 at 7:12 AM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: > The PowerNV PCI hotplug driver is going to use the OF changeset > to manage the changed device sub-tree. This exports those OF > changeset functions for that. > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Acked-by: Rob Herring <robh@kernel.org> > --- > drivers/of/dynamic.c | 65 ++++++++++++++++++++++++++++++++++--------------- > drivers/of/of_private.h | 2 ++ > drivers/of/overlay.c | 8 +++--- > drivers/of/unittest.c | 4 --- > 4 files changed, 52 insertions(+), 27 deletions(-) > > diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c > index 53826b8..c647bd1 100644 > --- a/drivers/of/dynamic.c > +++ b/drivers/of/dynamic.c > @@ -646,6 +646,7 @@ void of_changeset_init(struct of_changeset *ocs) > memset(ocs, 0, sizeof(*ocs)); > INIT_LIST_HEAD(&ocs->entries); > } > +EXPORT_SYMBOL_GPL(of_changeset_init); > > /** > * of_changeset_destroy - Destroy a changeset > @@ -662,20 +663,9 @@ void of_changeset_destroy(struct of_changeset *ocs) > list_for_each_entry_safe_reverse(ce, cen, &ocs->entries, node) > __of_changeset_entry_destroy(ce); > } > +EXPORT_SYMBOL_GPL(of_changeset_destroy); > > -/** > - * of_changeset_apply - Applies a changeset > - * > - * @ocs: changeset pointer > - * > - * Applies a changeset to the live tree. > - * Any side-effects of live tree state changes are applied here on > - * sucess, like creation/destruction of devices and side-effects > - * like creation of sysfs properties and directories. > - * Returns 0 on success, a negative error value in case of an error. > - * On error the partially applied effects are reverted. > - */ > -int of_changeset_apply(struct of_changeset *ocs) > +int __of_changeset_apply(struct of_changeset *ocs) > { > struct of_changeset_entry *ce; > int ret; > @@ -704,17 +694,30 @@ int of_changeset_apply(struct of_changeset *ocs) > } > > /** > - * of_changeset_revert - Reverts an applied changeset > + * of_changeset_apply - Applies a changeset > * > * @ocs: changeset pointer > * > - * Reverts a changeset returning the state of the tree to what it > - * was before the application. > - * Any side-effects like creation/destruction of devices and > - * removal of sysfs properties and directories are applied. > + * Applies a changeset to the live tree. > + * Any side-effects of live tree state changes are applied here on > + * success, like creation/destruction of devices and side-effects > + * like creation of sysfs properties and directories. > * Returns 0 on success, a negative error value in case of an error. > + * On error the partially applied effects are reverted. > */ > -int of_changeset_revert(struct of_changeset *ocs) > +int of_changeset_apply(struct of_changeset *ocs) > +{ > + int ret; > + > + mutex_lock(&of_mutex); > + ret = __of_changeset_apply(ocs); > + mutex_unlock(&of_mutex); > + > + return ret; > +} > +EXPORT_SYMBOL_GPL(of_changeset_apply); > + > +int __of_changeset_revert(struct of_changeset *ocs) > { > struct of_changeset_entry *ce; > int ret; > @@ -742,6 +745,29 @@ int of_changeset_revert(struct of_changeset *ocs) > } > > /** > + * of_changeset_revert - Reverts an applied changeset > + * > + * @ocs: changeset pointer > + * > + * Reverts a changeset returning the state of the tree to what it > + * was before the application. > + * Any side-effects like creation/destruction of devices and > + * removal of sysfs properties and directories are applied. > + * Returns 0 on success, a negative error value in case of an error. > + */ > +int of_changeset_revert(struct of_changeset *ocs) > +{ > + int ret; > + > + mutex_lock(&of_mutex); > + ret = __of_changeset_revert(ocs); > + mutex_unlock(&of_mutex); > + > + return ret; > +} > +EXPORT_SYMBOL_GPL(of_changeset_revert); > + > +/** > * of_changeset_action - Perform a changeset action > * > * @ocs: changeset pointer > @@ -779,3 +805,4 @@ int of_changeset_action(struct of_changeset *ocs, unsigned long action, > list_add_tail(&ce->node, &ocs->entries); > return 0; > } > +EXPORT_SYMBOL_GPL(of_changeset_action); > diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h > index 8e882e7..829469f 100644 > --- a/drivers/of/of_private.h > +++ b/drivers/of/of_private.h > @@ -45,6 +45,8 @@ static inline struct device_node *kobj_to_device_node(struct kobject *kobj) > extern int of_property_notify(int action, struct device_node *np, > struct property *prop, struct property *old_prop); > extern void of_node_release(struct kobject *kobj); > +extern int __of_changeset_apply(struct of_changeset *ocs); > +extern int __of_changeset_revert(struct of_changeset *ocs); > #else /* CONFIG_OF_DYNAMIC */ > static inline int of_property_notify(int action, struct device_node *np, > struct property *prop, struct property *old_prop) > diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c > index 24e025f..804ea33 100644 > --- a/drivers/of/overlay.c > +++ b/drivers/of/overlay.c > @@ -378,9 +378,9 @@ int of_overlay_create(struct device_node *tree) > } > > /* apply the changeset */ > - err = of_changeset_apply(&ov->cset); > + err = __of_changeset_apply(&ov->cset); > if (err) { > - pr_err("%s: of_changeset_apply() failed for tree@%s\n", > + pr_err("%s: __of_changeset_apply() failed for tree@%s\n", > __func__, tree->full_name); > goto err_revert_overlay; > } > @@ -508,7 +508,7 @@ int of_overlay_destroy(int id) > > > list_del(&ov->node); > - of_changeset_revert(&ov->cset); > + __of_changeset_revert(&ov->cset); > of_free_overlay_info(ov); > idr_remove(&ov_idr, id); > of_changeset_destroy(&ov->cset); > @@ -539,7 +539,7 @@ int of_overlay_destroy_all(void) > /* the tail of list is guaranteed to be safe to remove */ > list_for_each_entry_safe_reverse(ov, ovn, &ov_list, node) { > list_del(&ov->node); > - of_changeset_revert(&ov->cset); > + __of_changeset_revert(&ov->cset); > of_free_overlay_info(ov); > idr_remove(&ov_idr, ov->id); > kfree(ov); > diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c > index bafcf66..dad3fd2 100644 > --- a/drivers/of/unittest.c > +++ b/drivers/of/unittest.c > @@ -526,18 +526,14 @@ static void __init of_unittest_changeset(void) > unittest(!of_changeset_add_property(&chgset, parent, ppadd), "fail add prop\n"); > unittest(!of_changeset_update_property(&chgset, parent, ppupdate), "fail update prop\n"); > unittest(!of_changeset_remove_property(&chgset, parent, ppremove), "fail remove prop\n"); > - mutex_lock(&of_mutex); > unittest(!of_changeset_apply(&chgset), "apply failed\n"); > - mutex_unlock(&of_mutex); > > /* Make sure node names are constructed correctly */ > unittest((np = of_find_node_by_path("/testcase-data/changeset/n2/n21")), > "'%s' not added\n", n21->full_name); > of_node_put(np); > > - mutex_lock(&of_mutex); > unittest(!of_changeset_revert(&chgset), "revert failed\n"); > - mutex_unlock(&of_mutex); > > of_changeset_destroy(&chgset); > #endif > -- > 2.1.0 > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Nov 04, 2015 at 10:12:00AM -0600, Rob Herring wrote: >On Wed, Nov 4, 2015 at 7:12 AM, Gavin Shan <gwshan@linux.vnet.ibm.com> wrote: >> The PowerNV PCI hotplug driver is going to use the OF changeset >> to manage the changed device sub-tree. This exports those OF >> changeset functions for that. >> >> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> > >Acked-by: Rob Herring <robh@kernel.org> > Rob, thank you for the quick response :-) Thanks, Gavin >> --- >> drivers/of/dynamic.c | 65 ++++++++++++++++++++++++++++++++++--------------- >> drivers/of/of_private.h | 2 ++ >> drivers/of/overlay.c | 8 +++--- >> drivers/of/unittest.c | 4 --- >> 4 files changed, 52 insertions(+), 27 deletions(-) >> >> diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c >> index 53826b8..c647bd1 100644 >> --- a/drivers/of/dynamic.c >> +++ b/drivers/of/dynamic.c >> @@ -646,6 +646,7 @@ void of_changeset_init(struct of_changeset *ocs) >> memset(ocs, 0, sizeof(*ocs)); >> INIT_LIST_HEAD(&ocs->entries); >> } >> +EXPORT_SYMBOL_GPL(of_changeset_init); >> >> /** >> * of_changeset_destroy - Destroy a changeset >> @@ -662,20 +663,9 @@ void of_changeset_destroy(struct of_changeset *ocs) >> list_for_each_entry_safe_reverse(ce, cen, &ocs->entries, node) >> __of_changeset_entry_destroy(ce); >> } >> +EXPORT_SYMBOL_GPL(of_changeset_destroy); >> >> -/** >> - * of_changeset_apply - Applies a changeset >> - * >> - * @ocs: changeset pointer >> - * >> - * Applies a changeset to the live tree. >> - * Any side-effects of live tree state changes are applied here on >> - * sucess, like creation/destruction of devices and side-effects >> - * like creation of sysfs properties and directories. >> - * Returns 0 on success, a negative error value in case of an error. >> - * On error the partially applied effects are reverted. >> - */ >> -int of_changeset_apply(struct of_changeset *ocs) >> +int __of_changeset_apply(struct of_changeset *ocs) >> { >> struct of_changeset_entry *ce; >> int ret; >> @@ -704,17 +694,30 @@ int of_changeset_apply(struct of_changeset *ocs) >> } >> >> /** >> - * of_changeset_revert - Reverts an applied changeset >> + * of_changeset_apply - Applies a changeset >> * >> * @ocs: changeset pointer >> * >> - * Reverts a changeset returning the state of the tree to what it >> - * was before the application. >> - * Any side-effects like creation/destruction of devices and >> - * removal of sysfs properties and directories are applied. >> + * Applies a changeset to the live tree. >> + * Any side-effects of live tree state changes are applied here on >> + * success, like creation/destruction of devices and side-effects >> + * like creation of sysfs properties and directories. >> * Returns 0 on success, a negative error value in case of an error. >> + * On error the partially applied effects are reverted. >> */ >> -int of_changeset_revert(struct of_changeset *ocs) >> +int of_changeset_apply(struct of_changeset *ocs) >> +{ >> + int ret; >> + >> + mutex_lock(&of_mutex); >> + ret = __of_changeset_apply(ocs); >> + mutex_unlock(&of_mutex); >> + >> + return ret; >> +} >> +EXPORT_SYMBOL_GPL(of_changeset_apply); >> + >> +int __of_changeset_revert(struct of_changeset *ocs) >> { >> struct of_changeset_entry *ce; >> int ret; >> @@ -742,6 +745,29 @@ int of_changeset_revert(struct of_changeset *ocs) >> } >> >> /** >> + * of_changeset_revert - Reverts an applied changeset >> + * >> + * @ocs: changeset pointer >> + * >> + * Reverts a changeset returning the state of the tree to what it >> + * was before the application. >> + * Any side-effects like creation/destruction of devices and >> + * removal of sysfs properties and directories are applied. >> + * Returns 0 on success, a negative error value in case of an error. >> + */ >> +int of_changeset_revert(struct of_changeset *ocs) >> +{ >> + int ret; >> + >> + mutex_lock(&of_mutex); >> + ret = __of_changeset_revert(ocs); >> + mutex_unlock(&of_mutex); >> + >> + return ret; >> +} >> +EXPORT_SYMBOL_GPL(of_changeset_revert); >> + >> +/** >> * of_changeset_action - Perform a changeset action >> * >> * @ocs: changeset pointer >> @@ -779,3 +805,4 @@ int of_changeset_action(struct of_changeset *ocs, unsigned long action, >> list_add_tail(&ce->node, &ocs->entries); >> return 0; >> } >> +EXPORT_SYMBOL_GPL(of_changeset_action); >> diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h >> index 8e882e7..829469f 100644 >> --- a/drivers/of/of_private.h >> +++ b/drivers/of/of_private.h >> @@ -45,6 +45,8 @@ static inline struct device_node *kobj_to_device_node(struct kobject *kobj) >> extern int of_property_notify(int action, struct device_node *np, >> struct property *prop, struct property *old_prop); >> extern void of_node_release(struct kobject *kobj); >> +extern int __of_changeset_apply(struct of_changeset *ocs); >> +extern int __of_changeset_revert(struct of_changeset *ocs); >> #else /* CONFIG_OF_DYNAMIC */ >> static inline int of_property_notify(int action, struct device_node *np, >> struct property *prop, struct property *old_prop) >> diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c >> index 24e025f..804ea33 100644 >> --- a/drivers/of/overlay.c >> +++ b/drivers/of/overlay.c >> @@ -378,9 +378,9 @@ int of_overlay_create(struct device_node *tree) >> } >> >> /* apply the changeset */ >> - err = of_changeset_apply(&ov->cset); >> + err = __of_changeset_apply(&ov->cset); >> if (err) { >> - pr_err("%s: of_changeset_apply() failed for tree@%s\n", >> + pr_err("%s: __of_changeset_apply() failed for tree@%s\n", >> __func__, tree->full_name); >> goto err_revert_overlay; >> } >> @@ -508,7 +508,7 @@ int of_overlay_destroy(int id) >> >> >> list_del(&ov->node); >> - of_changeset_revert(&ov->cset); >> + __of_changeset_revert(&ov->cset); >> of_free_overlay_info(ov); >> idr_remove(&ov_idr, id); >> of_changeset_destroy(&ov->cset); >> @@ -539,7 +539,7 @@ int of_overlay_destroy_all(void) >> /* the tail of list is guaranteed to be safe to remove */ >> list_for_each_entry_safe_reverse(ov, ovn, &ov_list, node) { >> list_del(&ov->node); >> - of_changeset_revert(&ov->cset); >> + __of_changeset_revert(&ov->cset); >> of_free_overlay_info(ov); >> idr_remove(&ov_idr, ov->id); >> kfree(ov); >> diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c >> index bafcf66..dad3fd2 100644 >> --- a/drivers/of/unittest.c >> +++ b/drivers/of/unittest.c >> @@ -526,18 +526,14 @@ static void __init of_unittest_changeset(void) >> unittest(!of_changeset_add_property(&chgset, parent, ppadd), "fail add prop\n"); >> unittest(!of_changeset_update_property(&chgset, parent, ppupdate), "fail update prop\n"); >> unittest(!of_changeset_remove_property(&chgset, parent, ppremove), "fail remove prop\n"); >> - mutex_lock(&of_mutex); >> unittest(!of_changeset_apply(&chgset), "apply failed\n"); >> - mutex_unlock(&of_mutex); >> >> /* Make sure node names are constructed correctly */ >> unittest((np = of_find_node_by_path("/testcase-data/changeset/n2/n21")), >> "'%s' not added\n", n21->full_name); >> of_node_put(np); >> >> - mutex_lock(&of_mutex); >> unittest(!of_changeset_revert(&chgset), "revert failed\n"); >> - mutex_unlock(&of_mutex); >> >> of_changeset_destroy(&chgset); >> #endif >> -- >> 2.1.0 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe devicetree" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >_______________________________________________ >Linuxppc-dev mailing list >Linuxppc-dev@lists.ozlabs.org >https://lists.ozlabs.org/listinfo/linuxppc-dev
On Thu, Nov 05, 2015 at 12:12:49AM +1100, Gavin Shan wrote: > The PowerNV PCI hotplug driver is going to use the OF changeset > to manage the changed device sub-tree. This exports those OF > changeset functions for that. > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> > Acked-by: Rob Herring <robh@kernel.org> I needed something like this, too [1] and rebased my series on top of this patch. So: Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Thanks, Wolfram [1] https://lkml.org/lkml/2016/1/6/385
On Wed, 2016-01-13 at 14:54 +0100, Wolfram Sang wrote: > On Thu, Nov 05, 2015 at 12:12:49AM +1100, Gavin Shan wrote: > > The PowerNV PCI hotplug driver is going to use the OF changeset > > to manage the changed device sub-tree. This exports those OF > > changeset functions for that. > > > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> > > Acked-by: Rob Herring <robh@kernel.org> > > I needed something like this, too [1] and rebased my series on top of > this patch. So: > > Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> OK. This series is kind of in limbo, it might hit 4.6, but it might not. So if you need this patch before then you should probably pull it in to your series, or ask Rob to merge it pre-emptively. cheers
On Thu, Jan 14, 2016 at 08:18:06AM +1100, Michael Ellerman wrote: > On Wed, 2016-01-13 at 14:54 +0100, Wolfram Sang wrote: > > On Thu, Nov 05, 2015 at 12:12:49AM +1100, Gavin Shan wrote: > > > The PowerNV PCI hotplug driver is going to use the OF changeset > > > to manage the changed device sub-tree. This exports those OF > > > changeset functions for that. > > > > > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> > > > Acked-by: Rob Herring <robh@kernel.org> > > > > I needed something like this, too [1] and rebased my series on top of > > this patch. So: > > > > Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > > OK. This series is kind of in limbo, it might hit 4.6, but it might not. So if > you need this patch before then you should probably pull it in to your series, > or ask Rob to merge it pre-emptively. Yup, this is what I had in mind, too. Thanks, Wolfram
On Wed, Jan 13, 2016 at 3:20 PM, Wolfram Sang <wsa@the-dreams.de> wrote: > On Thu, Jan 14, 2016 at 08:18:06AM +1100, Michael Ellerman wrote: >> On Wed, 2016-01-13 at 14:54 +0100, Wolfram Sang wrote: >> > On Thu, Nov 05, 2015 at 12:12:49AM +1100, Gavin Shan wrote: >> > > The PowerNV PCI hotplug driver is going to use the OF changeset >> > > to manage the changed device sub-tree. This exports those OF >> > > changeset functions for that. >> > > >> > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> >> > > Acked-by: Rob Herring <robh@kernel.org> >> > >> > I needed something like this, too [1] and rebased my series on top of >> > this patch. So: >> > >> > Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com> >> > Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> >> >> OK. This series is kind of in limbo, it might hit 4.6, but it might not. So if >> you need this patch before then you should probably pull it in to your series, >> or ask Rob to merge it pre-emptively. > > Yup, this is what I had in mind, too. Given this has been on the list some time and still works, I've applied this for 4.5. That should simplify dependencies for 4.6. Rob
> Given this has been on the list some time and still works, I've > applied this for 4.5. That should simplify dependencies for 4.6. Cool, thanks Rob!
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index 53826b8..c647bd1 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -646,6 +646,7 @@ void of_changeset_init(struct of_changeset *ocs) memset(ocs, 0, sizeof(*ocs)); INIT_LIST_HEAD(&ocs->entries); } +EXPORT_SYMBOL_GPL(of_changeset_init); /** * of_changeset_destroy - Destroy a changeset @@ -662,20 +663,9 @@ void of_changeset_destroy(struct of_changeset *ocs) list_for_each_entry_safe_reverse(ce, cen, &ocs->entries, node) __of_changeset_entry_destroy(ce); } +EXPORT_SYMBOL_GPL(of_changeset_destroy); -/** - * of_changeset_apply - Applies a changeset - * - * @ocs: changeset pointer - * - * Applies a changeset to the live tree. - * Any side-effects of live tree state changes are applied here on - * sucess, like creation/destruction of devices and side-effects - * like creation of sysfs properties and directories. - * Returns 0 on success, a negative error value in case of an error. - * On error the partially applied effects are reverted. - */ -int of_changeset_apply(struct of_changeset *ocs) +int __of_changeset_apply(struct of_changeset *ocs) { struct of_changeset_entry *ce; int ret; @@ -704,17 +694,30 @@ int of_changeset_apply(struct of_changeset *ocs) } /** - * of_changeset_revert - Reverts an applied changeset + * of_changeset_apply - Applies a changeset * * @ocs: changeset pointer * - * Reverts a changeset returning the state of the tree to what it - * was before the application. - * Any side-effects like creation/destruction of devices and - * removal of sysfs properties and directories are applied. + * Applies a changeset to the live tree. + * Any side-effects of live tree state changes are applied here on + * success, like creation/destruction of devices and side-effects + * like creation of sysfs properties and directories. * Returns 0 on success, a negative error value in case of an error. + * On error the partially applied effects are reverted. */ -int of_changeset_revert(struct of_changeset *ocs) +int of_changeset_apply(struct of_changeset *ocs) +{ + int ret; + + mutex_lock(&of_mutex); + ret = __of_changeset_apply(ocs); + mutex_unlock(&of_mutex); + + return ret; +} +EXPORT_SYMBOL_GPL(of_changeset_apply); + +int __of_changeset_revert(struct of_changeset *ocs) { struct of_changeset_entry *ce; int ret; @@ -742,6 +745,29 @@ int of_changeset_revert(struct of_changeset *ocs) } /** + * of_changeset_revert - Reverts an applied changeset + * + * @ocs: changeset pointer + * + * Reverts a changeset returning the state of the tree to what it + * was before the application. + * Any side-effects like creation/destruction of devices and + * removal of sysfs properties and directories are applied. + * Returns 0 on success, a negative error value in case of an error. + */ +int of_changeset_revert(struct of_changeset *ocs) +{ + int ret; + + mutex_lock(&of_mutex); + ret = __of_changeset_revert(ocs); + mutex_unlock(&of_mutex); + + return ret; +} +EXPORT_SYMBOL_GPL(of_changeset_revert); + +/** * of_changeset_action - Perform a changeset action * * @ocs: changeset pointer @@ -779,3 +805,4 @@ int of_changeset_action(struct of_changeset *ocs, unsigned long action, list_add_tail(&ce->node, &ocs->entries); return 0; } +EXPORT_SYMBOL_GPL(of_changeset_action); diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index 8e882e7..829469f 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -45,6 +45,8 @@ static inline struct device_node *kobj_to_device_node(struct kobject *kobj) extern int of_property_notify(int action, struct device_node *np, struct property *prop, struct property *old_prop); extern void of_node_release(struct kobject *kobj); +extern int __of_changeset_apply(struct of_changeset *ocs); +extern int __of_changeset_revert(struct of_changeset *ocs); #else /* CONFIG_OF_DYNAMIC */ static inline int of_property_notify(int action, struct device_node *np, struct property *prop, struct property *old_prop) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 24e025f..804ea33 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -378,9 +378,9 @@ int of_overlay_create(struct device_node *tree) } /* apply the changeset */ - err = of_changeset_apply(&ov->cset); + err = __of_changeset_apply(&ov->cset); if (err) { - pr_err("%s: of_changeset_apply() failed for tree@%s\n", + pr_err("%s: __of_changeset_apply() failed for tree@%s\n", __func__, tree->full_name); goto err_revert_overlay; } @@ -508,7 +508,7 @@ int of_overlay_destroy(int id) list_del(&ov->node); - of_changeset_revert(&ov->cset); + __of_changeset_revert(&ov->cset); of_free_overlay_info(ov); idr_remove(&ov_idr, id); of_changeset_destroy(&ov->cset); @@ -539,7 +539,7 @@ int of_overlay_destroy_all(void) /* the tail of list is guaranteed to be safe to remove */ list_for_each_entry_safe_reverse(ov, ovn, &ov_list, node) { list_del(&ov->node); - of_changeset_revert(&ov->cset); + __of_changeset_revert(&ov->cset); of_free_overlay_info(ov); idr_remove(&ov_idr, ov->id); kfree(ov); diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index bafcf66..dad3fd2 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -526,18 +526,14 @@ static void __init of_unittest_changeset(void) unittest(!of_changeset_add_property(&chgset, parent, ppadd), "fail add prop\n"); unittest(!of_changeset_update_property(&chgset, parent, ppupdate), "fail update prop\n"); unittest(!of_changeset_remove_property(&chgset, parent, ppremove), "fail remove prop\n"); - mutex_lock(&of_mutex); unittest(!of_changeset_apply(&chgset), "apply failed\n"); - mutex_unlock(&of_mutex); /* Make sure node names are constructed correctly */ unittest((np = of_find_node_by_path("/testcase-data/changeset/n2/n21")), "'%s' not added\n", n21->full_name); of_node_put(np); - mutex_lock(&of_mutex); unittest(!of_changeset_revert(&chgset), "revert failed\n"); - mutex_unlock(&of_mutex); of_changeset_destroy(&chgset); #endif
The PowerNV PCI hotplug driver is going to use the OF changeset to manage the changed device sub-tree. This exports those OF changeset functions for that. Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- drivers/of/dynamic.c | 65 ++++++++++++++++++++++++++++++++++--------------- drivers/of/of_private.h | 2 ++ drivers/of/overlay.c | 8 +++--- drivers/of/unittest.c | 4 --- 4 files changed, 52 insertions(+), 27 deletions(-)