net: mscc: ocelot: delay devlink registration to the end

Open access to the devlink interface when the driver 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/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
index 2b8ea48d2fc45fb89f04ecbbe8c057d39ba4c63f..5d01993f6be0e4c4a0f38d054f89ea89c29ccd5e 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -1134,7 +1134,6 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
        if (err)
                goto out_put_ports;
 
-       devlink_register(devlink);
        err = mscc_ocelot_init_ports(pdev, ports);
        if (err)
                goto out_ocelot_devlink_unregister;
@@ -1157,6 +1156,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
        register_switchdev_blocking_notifier(&ocelot_switchdev_blocking_nb);
 
        of_node_put(ports);
+       devlink_register(devlink);
 
        dev_info(&pdev->dev, "Ocelot switch probed\n");
 
@@ -1166,7 +1166,6 @@ out_ocelot_release_ports:
        mscc_ocelot_release_ports(ocelot);
        mscc_ocelot_teardown_devlink_ports(ocelot);
 out_ocelot_devlink_unregister:
-       devlink_unregister(devlink);
        ocelot_deinit(ocelot);
 out_put_ports:
        of_node_put(ports);
@@ -1179,11 +1178,11 @@ static int mscc_ocelot_remove(struct platform_device *pdev)
 {
        struct ocelot *ocelot = platform_get_drvdata(pdev);
 
+       devlink_unregister(ocelot->devlink);
        ocelot_deinit_timestamp(ocelot);
        ocelot_devlink_sb_unregister(ocelot);
        mscc_ocelot_release_ports(ocelot);
        mscc_ocelot_teardown_devlink_ports(ocelot);
-       devlink_unregister(ocelot->devlink);
        ocelot_deinit(ocelot);
        unregister_switchdev_blocking_notifier(&ocelot_switchdev_blocking_nb);
        unregister_switchdev_notifier(&ocelot_switchdev_nb);