Merge tag 'iwlwifi-for-kalle-2016-02-15' of https://git.kernel.org/pub/scm/linux...

[deliverable/linux.git] / drivers / of / overlay.c

diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 54e5af9d737742db1b4cb83ef3101a4ee41c7e27..82250815e9a5620700e744a58b3661413fc72b23 100644 (file)
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -379,9 +379,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;
        }
@@ -511,7 +511,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);
@@ -542,7 +542,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);