nfp: Move delink_register to be last command

Open user space access to the devlink after driver is probed.

Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/devlink_param.c b/drivers/net/ethernet/netronome/nfp/devlink_param.c
index 36491835ac655343726ceca362996c44d057932a..db297ee4d7ad1002d9e54b76b24e02a6c1e998ab 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/devlink_param.c
+++ b/drivers/net/ethernet/netronome/nfp/devlink_param.c
@@ -233,13 +233,8 @@ int nfp_devlink_params_register(struct nfp_pf *pf)
        if (err <= 0)
                return err;
 
-       err = devlink_params_register(devlink, nfp_devlink_params,
-                                     ARRAY_SIZE(nfp_devlink_params));
-       if (err)
-               return err;
-
-       devlink_params_publish(devlink);
-       return 0;
+       return devlink_params_register(devlink, nfp_devlink_params,
+                                      ARRAY_SIZE(nfp_devlink_params));
 }
 
 void nfp_devlink_params_unregister(struct nfp_pf *pf)

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
index 616872928ada4d68be646967eb4e67aba84267ff..5fbb7c613ff16a2a4dce682c21fd550e64d9992a 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
@@ -701,7 +701,6 @@ int nfp_net_pci_probe(struct nfp_pf *pf)
        if (err)
                goto err_unmap;
 
-       devlink_register(devlink);
        err = nfp_shared_buf_register(pf);
        if (err)
                goto err_devlink_unreg;
@@ -731,6 +730,7 @@ int nfp_net_pci_probe(struct nfp_pf *pf)
                goto err_stop_app;
 
        mutex_unlock(&pf->lock);
+       devlink_register(devlink);
 
        return 0;
 
@@ -748,7 +748,6 @@ err_shared_buf_unreg:
        nfp_shared_buf_unregister(pf);
 err_devlink_unreg:
        cancel_work_sync(&pf->port_refresh_work);
-       devlink_unregister(devlink);
        nfp_net_pf_app_clean(pf);
 err_unmap:
        nfp_net_pci_unmap_mem(pf);
@@ -759,6 +758,7 @@ void nfp_net_pci_remove(struct nfp_pf *pf)
 {
        struct nfp_net *nn, *next;
 
+       devlink_unregister(priv_to_devlink(pf));
        mutex_lock(&pf->lock);
        list_for_each_entry_safe(nn, next, &pf->vnics, vnic_list) {
                if (!nfp_net_is_data_vnic(nn))
@@ -775,7 +775,6 @@ void nfp_net_pci_remove(struct nfp_pf *pf)
 
        nfp_devlink_params_unregister(pf);
        nfp_shared_buf_unregister(pf);
-       devlink_unregister(priv_to_devlink(pf));
 
        nfp_net_pf_free_irqs(pf);
        nfp_net_pf_app_clean(pf);