mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
net:fec: Add fec_enet_deinit()
[ Upstream commitbf0497f53c
] When fec_probe() fails or fec_drv_remove() needs to release the fec queue and remove a NAPI context, therefore add a function corresponding to fec_enet_init() and call fec_enet_deinit() which does the opposite to release memory and remove a NAPI context. Fixes:59d0f74656
("net: fec: init multi queue date structure") Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com> Reviewed-by: Wei Fang <wei.fang@nxp.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Link: https://lore.kernel.org/r/20240524050528.4115581-1-xiaolei.wang@windriver.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
0e09218399
commit
aff74215e0
1 changed files with 10 additions and 0 deletions
|
@ -4130,6 +4130,14 @@ static int fec_enet_init(struct net_device *ndev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static void fec_enet_deinit(struct net_device *ndev)
|
||||
{
|
||||
struct fec_enet_private *fep = netdev_priv(ndev);
|
||||
|
||||
netif_napi_del(&fep->napi);
|
||||
fec_enet_free_queue(ndev);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static int fec_reset_phy(struct platform_device *pdev)
|
||||
{
|
||||
|
@ -4524,6 +4532,7 @@ fec_probe(struct platform_device *pdev)
|
|||
fec_enet_mii_remove(fep);
|
||||
failed_mii_init:
|
||||
failed_irq:
|
||||
fec_enet_deinit(ndev);
|
||||
failed_init:
|
||||
fec_ptp_stop(pdev);
|
||||
failed_reset:
|
||||
|
@ -4587,6 +4596,7 @@ fec_drv_remove(struct platform_device *pdev)
|
|||
pm_runtime_put_noidle(&pdev->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
fec_enet_deinit(ndev);
|
||||
free_netdev(ndev);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue