mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-23 16:53:58 -05:00
Code Activity

net: fs_enet: remove redundant null check

Browse source 
Because clk_prepare_enable and clk_disable_unprepare already
checked NULL clock parameter, so the additional checks are
unnecessary, just remove them.

Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Zhang Changzhong 2020-07-20 19:12:33 +08:00 • committed by David S. Miller
parent 87c831ce8e
commit cebd2cac90
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
View file

@ -1043,8 +1043,7 @@ out_cleanup_data:
out_free_dev: out_free_dev:
free_netdev(ndev); free_netdev(ndev);
out_put: out_put:
if (fpi->clk_per) clk_disable_unprepare(fpi->clk_per);
clk_disable_unprepare(fpi->clk_per);
out_deregister_fixed_link: out_deregister_fixed_link:
of_node_put(fpi->phy_node); of_node_put(fpi->phy_node);
if (of_phy_is_fixed_link(ofdev->dev.of_node)) if (of_phy_is_fixed_link(ofdev->dev.of_node))
@ -1065,8 +1064,7 @@ static int fs_enet_remove(struct platform_device *ofdev)
fep->ops->cleanup_data(ndev); fep->ops->cleanup_data(ndev);
dev_set_drvdata(fep->dev, NULL); dev_set_drvdata(fep->dev, NULL);
of_node_put(fep->fpi->phy_node); of_node_put(fep->fpi->phy_node);
if (fep->fpi->clk_per) clk_disable_unprepare(fep->fpi->clk_per);
clk_disable_unprepare(fep->fpi->clk_per);
if (of_phy_is_fixed_link(ofdev->dev.of_node)) if (of_phy_is_fixed_link(ofdev->dev.of_node))
of_phy_deregister_fixed_link(ofdev->dev.of_node); of_phy_deregister_fixed_link(ofdev->dev.of_node);
free_netdev(ndev); free_netdev(ndev);