nfp: flower: Remove usage of the deprecated ida_simple_xxx API
Subsystems (3)
PATCH 1/1 nfp: flower: Remove usage of the deprecated ida_simple_xxx API
From: Christophe JAILLET <[email protected]>
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 <[email protected]>
Signed-off-by Simon Horman <[email protected]>
--- .../net/ethernet/netronome/nfp/flower/tunnel_conf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c +5 -5
@@ -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 @@ nfp_tunnel_add_shared_mac(struct nfp_app *app, struct net_device *netdev,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);
Signature · 1 line
2.20.1
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Tue, 1 Mar 2022 14:12:12 +0100 you wrote:
From: Christophe JAILLET <[email protected]>
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 <[email protected]>Signed-off-by Simon Horman <[email protected]>[...]
Here is the summary with links:
- [net-next] nfp: flower: Remove usage of the deprecated ida_simple_xxx API
https://git.kernel.org/netdev/net-next/c/432509013f66
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html