nfp: flower: Remove usage of the deprecated ida_simple_xxx API

Use ida_alloc_xxx()/ida_free() instead to
ida_simple_get()/ida_simple_remove().
The latter is deprecated and more verbose.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20220301131212.26348-1-simon.horman@corigine.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
index 9244b35e385590976891ac8d8202fc2b8c0cac04..c71bd555f482e240ce2bb0f9d3af9c02fa58e25e 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
@@ -942,8 +942,8 @@ nfp_tunnel_add_shared_mac(struct nfp_app *app, struct net_device *netdev,
        if (!nfp_mac_idx) {
                /* Assign a global index if non-repr or MAC is now shared. */
                if (entry || !port) {
-                       ida_idx = ida_simple_get(&priv->tun.mac_off_ids, 0,
-                                                NFP_MAX_MAC_INDEX, GFP_KERNEL);
+                       ida_idx = ida_alloc_max(&priv->tun.mac_off_ids,
+                                               NFP_MAX_MAC_INDEX, GFP_KERNEL);
                        if (ida_idx < 0)
                                return ida_idx;
 
@@ -998,7 +998,7 @@ err_free_entry:
        kfree(entry);
 err_free_ida:
        if (ida_idx != -1)
-               ida_simple_remove(&priv->tun.mac_off_ids, ida_idx);
+               ida_free(&priv->tun.mac_off_ids, ida_idx);
 
        return err;
 }
@@ -1061,7 +1061,7 @@ nfp_tunnel_del_shared_mac(struct nfp_app *app, struct net_device *netdev,
                }
 
                ida_idx = nfp_tunnel_get_ida_from_global_mac_idx(entry->index);
-               ida_simple_remove(&priv->tun.mac_off_ids, ida_idx);
+               ida_free(&priv->tun.mac_off_ids, ida_idx);
                entry->index = nfp_mac_idx;
                return 0;
        }
@@ -1081,7 +1081,7 @@ nfp_tunnel_del_shared_mac(struct nfp_app *app, struct net_device *netdev,
        /* If MAC has global ID then extract and free the ida entry. */
        if (nfp_tunnel_is_mac_idx_global(nfp_mac_idx)) {
                ida_idx = nfp_tunnel_get_ida_from_global_mac_idx(entry->index);
-               ida_simple_remove(&priv->tun.mac_off_ids, ida_idx);
+               ida_free(&priv->tun.mac_off_ids, ida_idx);
        }
 
        kfree(entry);