github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-10-12 21:31:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: ethernet: mediatek: cleanup error path inside mtk_hw_init

Browse Source 
This cleans up the error path inside mtk_hw_init call, causing it able
to exit appropriately when something fails and also includes refactoring
mtk_cleanup call to make the partial logic reusable on the error path.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sean Wang 2016-09-14 23:13:17 +08:00 committed by David S. Miller
parent bf253fb722
commit 8a8a9e89f8
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/net/ethernet/mediatek/mtk_eth_soc.c
View File

@ -1567,17 +1567,36 @@ static void mtk_pending_work(struct work_struct *work)
rtnl_unlock(); rtnl_unlock();
} }
static int mtk_cleanup(struct mtk_eth *eth) static int mtk_free_dev(struct mtk_eth *eth)
{ {
int i; int i;
for (i = 0; i < MTK_MAC_COUNT; i++) { for (i = 0; i < MTK_MAC_COUNT; i++) {
if (!eth->netdev[i]) if (!eth->netdev[i])
continue; continue;
unregister_netdev(eth->netdev[i]);
free_netdev(eth->netdev[i]); free_netdev(eth->netdev[i]);
} }
return 0;
}
static int mtk_unreg_dev(struct mtk_eth *eth)
{
int i;
for (i = 0; i < MTK_MAC_COUNT; i++) {
if (!eth->netdev[i])
continue;
unregister_netdev(eth->netdev[i]);
}
return 0;
}
static int mtk_cleanup(struct mtk_eth *eth)
{
mtk_unreg_dev(eth);
mtk_free_dev(eth);
cancel_work_sync(&eth->pending_work); cancel_work_sync(&eth->pending_work);
return 0; return 0;
@ -1875,7 +1894,7 @@ static int mtk_probe(struct platform_device *pdev)
err = mtk_add_mac(eth, mac_np); err = mtk_add_mac(eth, mac_np);
if (err) if (err)
goto err_free_dev; goto err_deinit_hw;
} }
err = devm_request_irq(eth->dev, eth->irq[1], mtk_handle_irq_tx, 0, err = devm_request_irq(eth->dev, eth->irq[1], mtk_handle_irq_tx, 0,
@ -1899,7 +1918,7 @@ static int mtk_probe(struct platform_device *pdev)
err = register_netdev(eth->netdev[i]); err = register_netdev(eth->netdev[i]);
if (err) { if (err) {
dev_err(eth->dev, "error bringing up device\n"); dev_err(eth->dev, "error bringing up device\n");
goto err_free_dev; goto err_deinit_mdio;
} else } else
netif_info(eth, probe, eth->netdev[i], netif_info(eth, probe, eth->netdev[i],
"mediatek frame engine at 0x%08lx, irq %d\n", "mediatek frame engine at 0x%08lx, irq %d\n",
@ -1919,8 +1938,13 @@ static int mtk_probe(struct platform_device *pdev)
return 0; return 0;
err_deinit_mdio:
mtk_mdio_cleanup(eth);
err_free_dev: err_free_dev:
mtk_cleanup(eth); mtk_free_dev(eth);
err_deinit_hw:
mtk_hw_deinit(eth);
return err; return err;
} }