net: sparx5: move netdev and notifier block registration to probe

Move netdev registration and notifier block registration from
sparx5_start() to probe(). This allows proper cleanup via goto-based
error labels in probe().

Also, remove the sparx5_cleanup_ports() helper as its functionality is now
split between sparx5_unregister_netdevs() and sparx5_destroy_netdevs()
called at appropriate points.

Signed-off-by: Daniel Machon <daniel.machon@microchip.com>
Link: https://patch.msgid.link/20260227-sparx5-init-deinit-v2-1-10ba54ccf005@microchip.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
index 9befd0719f74e555b32e3ff9d7d02f4607aac737..e07bf414afdf76e58939d95990e0b072f7356b56 100644 (file)
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
@@ -773,20 +773,11 @@ static int sparx5_start(struct sparx5 *sparx5)
        mutex_init(&sparx5->mdb_lock);
        INIT_LIST_HEAD(&sparx5->mdb_entries);
 
-       err = sparx5_register_netdevs(sparx5);
-       if (err)
-               return err;
-
        sparx5_board_init(sparx5);
-       err = sparx5_register_notifier_blocks(sparx5);
-       if (err)
-               return err;
 
        err = sparx5_vcap_init(sparx5);
-       if (err) {
-               sparx5_unregister_notifier_blocks(sparx5);
+       if (err)
                return err;
-       }
 
        /* Start Frame DMA with fallback to register based INJ/XTR */
        err = -ENXIO;
@@ -835,12 +826,6 @@ static int sparx5_start(struct sparx5 *sparx5)
        return err;
 }
 
-static void sparx5_cleanup_ports(struct sparx5 *sparx5)
-{
-       sparx5_unregister_netdevs(sparx5);
-       sparx5_destroy_netdevs(sparx5);
-}
-
 static int mchp_sparx5_probe(struct platform_device *pdev)
 {
        struct initial_port_config *configs, *config;
@@ -1019,10 +1004,26 @@ static int mchp_sparx5_probe(struct platform_device *pdev)
 
        INIT_LIST_HEAD(&sparx5->mall_entries);
 
+       err = sparx5_register_netdevs(sparx5);
+       if (err) {
+               dev_err(sparx5->dev, "Failed to register net devices\n");
+               goto cleanup_ptp;
+       }
+
+       err = sparx5_register_notifier_blocks(sparx5);
+       if (err) {
+               dev_err(sparx5->dev, "Failed to register notifier blocks\n");
+               goto cleanup_netdevs;
+       }
+
        goto cleanup_config;
 
+cleanup_netdevs:
+       sparx5_unregister_netdevs(sparx5);
+cleanup_ptp:
+       sparx5_ptp_deinit(sparx5);
 cleanup_ports:
-       sparx5_cleanup_ports(sparx5);
+       sparx5_destroy_netdevs(sparx5);
        if (sparx5->mact_queue)
                destroy_workqueue(sparx5->mact_queue);
 cleanup_config:
@@ -1046,12 +1047,12 @@ static void mchp_sparx5_remove(struct platform_device *pdev)
                disable_irq(sparx5->fdma_irq);
                sparx5->fdma_irq = -ENXIO;
        }
+       sparx5_unregister_notifier_blocks(sparx5);
+       sparx5_unregister_netdevs(sparx5);
        sparx5_ptp_deinit(sparx5);
        ops->fdma_deinit(sparx5);
-       sparx5_cleanup_ports(sparx5);
        sparx5_vcap_destroy(sparx5);
-       /* Unregister netdevs */
-       sparx5_unregister_notifier_blocks(sparx5);
+       sparx5_destroy_netdevs(sparx5);
        destroy_workqueue(sparx5->mact_queue);
 }