MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-19 07:39:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
commit 99975ad644 upstream.

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: 9428148401 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Herve Codina 2024-05-13 13:18:53 +02:00 committed by Greg Kroah-Hartman
parent 5cd17f0e74
commit 77237eabdc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/microchip/lan966x/lan966x_main.c
View File

@ -1088,8 +1088,6 @@ static int lan966x_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, lan966x); platform_set_drvdata(pdev, lan966x);
lan966x->dev = &pdev->dev; lan966x->dev = &pdev->dev;
lan966x->debugfs_root = debugfs_create_dir("lan966x", NULL);
if (!device_get_mac_address(&pdev->dev, mac_addr)) { if (!device_get_mac_address(&pdev->dev, mac_addr)) {
ether_addr_copy(lan966x->base_mac, mac_addr); ether_addr_copy(lan966x->base_mac, mac_addr);
} else { } else {
@ -1180,6 +1178,8 @@ static int lan966x_probe(struct platform_device *pdev)
return dev_err_probe(&pdev->dev, -ENODEV, return dev_err_probe(&pdev->dev, -ENODEV,
"no ethernet-ports child found\n"); "no ethernet-ports child found\n");
lan966x->debugfs_root = debugfs_create_dir("lan966x", NULL);
/* init switch */ /* init switch */
lan966x_init(lan966x); lan966x_init(lan966x);
lan966x_stats_init(lan966x); lan966x_stats_init(lan966x);
@ -1258,6 +1258,8 @@ cleanup_ports:
destroy_workqueue(lan966x->stats_queue); destroy_workqueue(lan966x->stats_queue);
mutex_destroy(&lan966x->stats_lock); mutex_destroy(&lan966x->stats_lock);
debugfs_remove_recursive(lan966x->debugfs_root);
return err; return err;
} }