software node: Remove usage of the deprecated ida_simple_xx() API

ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

This is less verbose.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/c7cdc3566c783d106138698b1e1923351fabace8.1698831275.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index 1886995a0b3a30e3067d3c7eb5895bcdbea99b22..f7c4317b2ccfe930d35980b9ee77cc7d8dc4174c 100644 (file)
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -747,10 +747,10 @@ static void software_node_release(struct kobject *kobj)
        struct swnode *swnode = kobj_to_swnode(kobj);
 
        if (swnode->parent) {
-               ida_simple_remove(&swnode->parent->child_ids, swnode->id);
+               ida_free(&swnode->parent->child_ids, swnode->id);
                list_del(&swnode->entry);
        } else {
-               ida_simple_remove(&swnode_root_ids, swnode->id);
+               ida_free(&swnode_root_ids, swnode->id);
        }
 
        if (swnode->allocated)
@@ -776,8 +776,8 @@ swnode_register(const struct software_node *node, struct swnode *parent,
        if (!swnode)
                return ERR_PTR(-ENOMEM);
 
-       ret = ida_simple_get(parent ? &parent->child_ids : &swnode_root_ids,
-                            0, 0, GFP_KERNEL);
+       ret = ida_alloc(parent ? &parent->child_ids : &swnode_root_ids,
+                       GFP_KERNEL);
        if (ret < 0) {
                kfree(swnode);
                return ERR_PTR(ret);