| 123456789101112131415161718192021222324252627282930313233343536 |
- From 555baec974ede81e616ca88ac6d3fca09239368f Mon Sep 17 00:00:00 2001
- From: Jonas Gorski <[email protected]>
- Date: Tue, 18 Jul 2017 13:18:01 +0200
- Subject: [PATCH 5/6] 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 <[email protected]>
- ---
- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
- --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
- +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
- @@ -1918,8 +1918,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);
- @@ -1958,9 +1957,7 @@ static int bcm_enet_remove(struct platfo
- }
-
- /* 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);
|
