thunderbolt: 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().

Note that the upper limit of ida_simple_get() is exclusive, but the one of
ida_alloc_range()/ida_alloc_max() is inclusive. So a -1 has been added
when needed.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/thunderbolt/domain.c b/drivers/thunderbolt/domain.c
index df0d845e069aca41643e850b84673b7a73330396..ee8a894bd70d16113a482a8ec3a4add6581183f6 100644 (file)
--- a/drivers/thunderbolt/domain.c
+++ b/drivers/thunderbolt/domain.c
@@ -321,7 +321,7 @@ static void tb_domain_release(struct device *dev)
 
        tb_ctl_free(tb->ctl);
        destroy_workqueue(tb->wq);
-       ida_simple_remove(&tb_domain_ida, tb->index);
+       ida_free(&tb_domain_ida, tb->index);
        mutex_destroy(&tb->lock);
        kfree(tb);
 }
@@ -389,7 +389,7 @@ struct tb *tb_domain_alloc(struct tb_nhi *nhi, int timeout_msec, size_t privsize
        tb->nhi = nhi;
        mutex_init(&tb->lock);
 
-       tb->index = ida_simple_get(&tb_domain_ida, 0, 0, GFP_KERNEL);
+       tb->index = ida_alloc(&tb_domain_ida, GFP_KERNEL);
        if (tb->index < 0)
                goto err_free;
 
@@ -413,7 +413,7 @@ struct tb *tb_domain_alloc(struct tb_nhi *nhi, int timeout_msec, size_t privsize
 err_destroy_wq:
        destroy_workqueue(tb->wq);
 err_remove_ida:
-       ida_simple_remove(&tb_domain_ida, tb->index);
+       ida_free(&tb_domain_ida, tb->index);
 err_free:
        kfree(tb);
 

diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index b22023fae60de43d8e456f24a9bf94770461a97d..e8a4623dc531979d5acbbd6fdf90284e89c0f77e 100644 (file)
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -465,7 +465,7 @@ static int ring_request_msix(struct tb_ring *ring, bool no_suspend)
        if (!nhi->pdev->msix_enabled)
                return 0;
 
-       ret = ida_simple_get(&nhi->msix_ida, 0, MSIX_MAX_VECS, GFP_KERNEL);
+       ret = ida_alloc_max(&nhi->msix_ida, MSIX_MAX_VECS - 1, GFP_KERNEL);
        if (ret < 0)
                return ret;
 
@@ -485,7 +485,7 @@ static int ring_request_msix(struct tb_ring *ring, bool no_suspend)
        return 0;
 
 err_ida_remove:
-       ida_simple_remove(&nhi->msix_ida, ring->vector);
+       ida_free(&nhi->msix_ida, ring->vector);
 
        return ret;
 }
@@ -496,7 +496,7 @@ static void ring_release_msix(struct tb_ring *ring)
                return;
 
        free_irq(ring->irq, ring);
-       ida_simple_remove(&ring->nhi->msix_ida, ring->vector);
+       ida_free(&ring->nhi->msix_ida, ring->vector);
        ring->vector = 0;
        ring->irq = 0;
 }

diff --git a/drivers/thunderbolt/nvm.c b/drivers/thunderbolt/nvm.c
index 69fb3b0fa34fa34323b2c0f74788a7e5f2b67dd2..8901db2de327cdbbdcc0a52fd69f187b29f76353 100644 (file)
--- a/drivers/thunderbolt/nvm.c
+++ b/drivers/thunderbolt/nvm.c
@@ -330,7 +330,7 @@ struct tb_nvm *tb_nvm_alloc(struct device *dev)
        if (!nvm)
                return ERR_PTR(-ENOMEM);
 
-       ret = ida_simple_get(&nvm_ida, 0, 0, GFP_KERNEL);
+       ret = ida_alloc(&nvm_ida, GFP_KERNEL);
        if (ret < 0) {
                kfree(nvm);
                return ERR_PTR(ret);
@@ -528,7 +528,7 @@ void tb_nvm_free(struct tb_nvm *nvm)
                nvmem_unregister(nvm->non_active);
                nvmem_unregister(nvm->active);
                vfree(nvm->buf);
-               ida_simple_remove(&nvm_ida, nvm->id);
+               ida_free(&nvm_ida, nvm->id);
        }
        kfree(nvm);
 }

diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index bf1daf5165a4e5b94917139fd9169254b4cf0891..bca6f28c553b085ddb8ac6a4e8ddf6f2915543f5 100644 (file)
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -778,7 +778,7 @@ static int tb_port_alloc_hopid(struct tb_port *port, bool in, int min_hopid,
        if (max_hopid < 0 || max_hopid > port_max_hopid)
                max_hopid = port_max_hopid;
 
-       return ida_simple_get(ida, min_hopid, max_hopid + 1, GFP_KERNEL);
+       return ida_alloc_range(ida, min_hopid, max_hopid, GFP_KERNEL);
 }
 
 /**
@@ -816,7 +816,7 @@ int tb_port_alloc_out_hopid(struct tb_port *port, int min_hopid, int max_hopid)
  */
 void tb_port_release_in_hopid(struct tb_port *port, int hopid)
 {
-       ida_simple_remove(&port->in_hopids, hopid);
+       ida_free(&port->in_hopids, hopid);
 }
 
 /**
@@ -826,7 +826,7 @@ void tb_port_release_in_hopid(struct tb_port *port, int hopid)
  */
 void tb_port_release_out_hopid(struct tb_port *port, int hopid)
 {
-       ida_simple_remove(&port->out_hopids, hopid);
+       ida_free(&port->out_hopids, hopid);
 }
 
 static inline bool tb_switch_is_reachable(const struct tb_switch *parent,

diff --git a/drivers/thunderbolt/xdomain.c b/drivers/thunderbolt/xdomain.c
index 10693a3ac16dd719d54884d3107c8458c521c804..b48df88981bdadb327b6b77e30ed0874f342672a 100644 (file)
--- a/drivers/thunderbolt/xdomain.c
+++ b/drivers/thunderbolt/xdomain.c
@@ -997,7 +997,7 @@ static void tb_service_release(struct device *dev)
        struct tb_xdomain *xd = tb_service_parent(svc);
 
        tb_service_debugfs_remove(svc);
-       ida_simple_remove(&xd->service_ids, svc->id);
+       ida_free(&xd->service_ids, svc->id);
        kfree(svc->key);
        kfree(svc);
 }
@@ -1099,7 +1099,7 @@ static void enumerate_services(struct tb_xdomain *xd)
                        break;
                }
 
-               id = ida_simple_get(&xd->service_ids, 0, 0, GFP_KERNEL);
+               id = ida_alloc(&xd->service_ids, GFP_KERNEL);
                if (id < 0) {
                        kfree(svc->key);
                        kfree(svc);