summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2017-10-01 14:02:19 +0300
committerDavid S. Miller <davem@davemloft.net>2017-10-02 09:05:11 +0300
commit4e78e5c5d881bf2d6267545a554c1baf245257b7 (patch)
treef34f6e6a8f2cacab01f6fcb978c11277ea268ec5 /drivers
parent7e697ce99ceb09538cdc1dfa9ebb3db60236b0a7 (diff)
downloadlinux-4e78e5c5d881bf2d6267545a554c1baf245257b7.tar.xz
bcm63xx_enet: drop unneeded NULL phy_clk check
clk_disable and clk_unprepare are NULL-safe, so need to duplicate the NULL check of the functions. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/broadcom/bcm63xx_enet.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 059ef4f1d137..f6bc13fe8a99 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1903,8 +1903,7 @@ out_free_mdio:
out_uninit_hw:
/* turn off mdc clock */
enet_writel(priv, 0, ENET_MIISC_REG);
- if (priv->phy_clk)
- clk_disable_unprepare(priv->phy_clk);
+ clk_disable_unprepare(priv->phy_clk);
out_disable_clk_mac:
clk_disable_unprepare(priv->mac_clk);
@@ -1943,9 +1942,7 @@ static int bcm_enet_remove(struct platform_device *pdev)
}
/* disable hw block clocks */
- if (priv->phy_clk)
- clk_disable_unprepare(priv->phy_clk);
-
+ clk_disable_unprepare(priv->phy_clk);
clk_disable_unprepare(priv->mac_clk);
free_netdev(dev);