diff options
| author | Zhang Changzhong <[email protected]> | 2020-07-20 11:12:33 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2020-07-21 00:42:17 +0000 |
| commit | cebd2cac905e5a665bc992c7725f98bf6cd4a21d (patch) | |
| tree | c0a69bfb343d7d0ec57b4d095cfc61a709abf85e /drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | |
| parent | Merge branch 'net-macb-Wake-on-Lan-magic-packet-GEM-and-MACB-handling' (diff) | |
| download | kernel-cebd2cac905e5a665bc992c7725f98bf6cd4a21d.tar.gz kernel-cebd2cac905e5a665bc992c7725f98bf6cd4a21d.zip | |
net: fs_enet: remove redundant null check
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c index b0d4b1984a70..bf846b42bc74 100644 --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c @@ -1043,8 +1043,7 @@ out_cleanup_data: out_free_dev: free_netdev(ndev); out_put: - if (fpi->clk_per) - clk_disable_unprepare(fpi->clk_per); + clk_disable_unprepare(fpi->clk_per); out_deregister_fixed_link: of_node_put(fpi->phy_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); dev_set_drvdata(fep->dev, NULL); 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)) of_phy_deregister_fixed_link(ofdev->dev.of_node); free_netdev(ndev); |