net: lan966x: remove debugfs directory in probe() error path

A debugfs directory entry is create early during probe(). This entry is
not removed on error path leading to some "already present" issues in
case of EPROBE_DEFER.

Create this entry later in the probe() code to avoid the need to change
many 'return' in 'goto' and add the removal in the already present error
path.

Fixes: 942814840127 ("net: lan966x: Add VCAP debugFS support")
Cc: <stable@vger.kernel.org>
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
index b12d3b8a64fd3f655f5a4462351f0e360d9e9055..a3b919a3ce07339ee38826ad929168435dcc7c7f 100644 (file)
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
@@ -1087,8 +1087,6 @@ static int lan966x_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, lan966x);
        lan966x->dev = &pdev->dev;
 
-       lan966x->debugfs_root = debugfs_create_dir("lan966x", NULL);
-
        if (!device_get_mac_address(&pdev->dev, mac_addr)) {
                ether_addr_copy(lan966x->base_mac, mac_addr);
        } else {
@@ -1179,6 +1177,8 @@ static int lan966x_probe(struct platform_device *pdev)
                return dev_err_probe(&pdev->dev, -ENODEV,
                                     "no ethernet-ports child found\n");
 
+       lan966x->debugfs_root = debugfs_create_dir("lan966x", NULL);
+
        /* init switch */
        lan966x_init(lan966x);
        lan966x_stats_init(lan966x);
@@ -1257,6 +1257,8 @@ cleanup_ports:
        destroy_workqueue(lan966x->stats_queue);
        mutex_destroy(&lan966x->stats_lock);
 
+       debugfs_remove_recursive(lan966x->debugfs_root);
+
        return err;
 }