clk_disable and clk_unprepare are NULL-safe, so need to duplicate the
NULL check of the functions.

Signed-off-by: Jonas Gorski <jonas.gor...@gmail.com>
---
 drivers/net/ethernet/broadcom/bcm63xx_enet.c | 7 ++-----
 1 file 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 @@ static int bcm_enet_probe(struct platform_device *pdev)
 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);
-- 
2.13.2

Reply via email to