ice: Open devlink when device is ready

Move devlink_registration routine to be the last command, when the
device is fully initialized.

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

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index aacc0b345bbe66082daa2f82096350e776c22997..627adf8fb89dab8d4def67c9d8feee5db699c9e8 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -4258,8 +4258,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
 
        pf->msg_enable = netif_msg_init(debug, ICE_DFLT_NETIF_M);
 
-       ice_devlink_register(pf);
-
 #ifndef CONFIG_DYNAMIC_DEBUG
        if (debug < -1)
                hw->debug_mask = debug;
@@ -4493,6 +4491,7 @@ probe_done:
                dev_warn(dev, "RDMA is not supported on this device\n");
        }
 
+       ice_devlink_register(pf);
        return 0;
 
 err_init_aux_unroll:
@@ -4516,7 +4515,6 @@ err_init_pf_unroll:
        ice_devlink_destroy_regions(pf);
        ice_deinit_hw(hw);
 err_exit_unroll:
-       ice_devlink_unregister(pf);
        pci_disable_pcie_error_reporting(pdev);
        pci_disable_device(pdev);
        return err;
@@ -4593,6 +4591,7 @@ static void ice_remove(struct pci_dev *pdev)
        struct ice_pf *pf = pci_get_drvdata(pdev);
        int i;
 
+       ice_devlink_unregister(pf);
        for (i = 0; i < ICE_MAX_RESET_WAIT; i++) {
                if (!ice_is_reset_in_progress(pf->state))
                        break;
@@ -4629,7 +4628,6 @@ static void ice_remove(struct pci_dev *pdev)
        ice_deinit_pf(pf);
        ice_devlink_destroy_regions(pf);
        ice_deinit_hw(&pf->hw);
-       ice_devlink_unregister(pf);
 
        /* Issue a PFR as part of the prescribed driver unload flow.  Do not
         * do it via ice_schedule_reset() since there is no need to rebuild