nfp: add nfp_net_pf_free_vnic() function

Soon a third place will need to free a struct nfp_net.  Add a free
counterpart to nfp_net_pf_alloc_vnic().

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
index 532371940fd687d2779fe9e88208e5cd8a80a6b4..5f0c58a561821ba4b5fffa4a3c725af4a8a5e39e 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
@@ -268,16 +268,20 @@ static u8 __iomem *nfp_net_pf_map_ctrl_bar(struct nfp_pf *pf)
        return ctrl_bar;
 }
 
+static void nfp_net_pf_free_vnic(struct nfp_pf *pf, struct nfp_net *nn)
+{
+       list_del(&nn->vnic_list);
+       pf->num_vnics--;
+       nfp_net_free(nn);
+}
+
 static void nfp_net_pf_free_vnics(struct nfp_pf *pf)
 {
        struct nfp_net *nn;
 
        while (!list_empty(&pf->vnics)) {
                nn = list_first_entry(&pf->vnics, struct nfp_net, vnic_list);
-               list_del(&nn->vnic_list);
-               pf->num_vnics--;
-
-               nfp_net_free(nn);
+               nfp_net_pf_free_vnic(pf, nn);
        }
 }
 
@@ -518,9 +522,7 @@ static void nfp_net_refresh_vnics(struct work_struct *work)
                nfp_net_debugfs_dir_clean(&nn->debugfs_dir);
                nfp_net_clean(nn);
 
-               list_del(&nn->vnic_list);
-               pf->num_vnics--;
-               nfp_net_free(nn);
+               nfp_net_pf_free_vnic(pf, nn);
        }
 
        if (list_empty(&pf->vnics))