Re: [PATCH net-next] net: stmmac: Remove useless test before clk_disable_unprepare

2018-05-16 Thread David Miller
From: YueHaibing 
Date: Wed, 16 May 2018 18:59:19 +0800

> clk_disable_unprepare() already checks that the clock pointer is valid.
> No need to test it before calling it.
> 
> Signed-off-by: YueHaibing 

Applied.


[PATCH net-next] net: stmmac: Remove useless test before clk_disable_unprepare

2018-05-16 Thread YueHaibing
clk_disable_unprepare() already checks that the clock pointer is valid.
No need to test it before calling it.

Signed-off-by: YueHaibing 
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 24 +++-
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c 
b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index 13133b3..f08625a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -1104,30 +1104,20 @@ static int gmac_clk_enable(struct rk_priv_data 
*bsp_priv, bool enable)
} else {
if (bsp_priv->clk_enabled) {
if (phy_iface == PHY_INTERFACE_MODE_RMII) {
-   if (!IS_ERR(bsp_priv->mac_clk_rx))
-   clk_disable_unprepare(
-   bsp_priv->mac_clk_rx);
+   clk_disable_unprepare(bsp_priv->mac_clk_rx);
 
-   if (!IS_ERR(bsp_priv->clk_mac_ref))
-   clk_disable_unprepare(
-   bsp_priv->clk_mac_ref);
+   clk_disable_unprepare(bsp_priv->clk_mac_ref);
 
-   if (!IS_ERR(bsp_priv->clk_mac_refout))
-   clk_disable_unprepare(
-   bsp_priv->clk_mac_refout);
+   clk_disable_unprepare(bsp_priv->clk_mac_refout);
}
 
-   if (!IS_ERR(bsp_priv->clk_phy))
-   clk_disable_unprepare(bsp_priv->clk_phy);
+   clk_disable_unprepare(bsp_priv->clk_phy);
 
-   if (!IS_ERR(bsp_priv->aclk_mac))
-   clk_disable_unprepare(bsp_priv->aclk_mac);
+   clk_disable_unprepare(bsp_priv->aclk_mac);
 
-   if (!IS_ERR(bsp_priv->pclk_mac))
-   clk_disable_unprepare(bsp_priv->pclk_mac);
+   clk_disable_unprepare(bsp_priv->pclk_mac);
 
-   if (!IS_ERR(bsp_priv->mac_clk_tx))
-   clk_disable_unprepare(bsp_priv->mac_clk_tx);
+   clk_disable_unprepare(bsp_priv->mac_clk_tx);
/**
 * if (!IS_ERR(bsp_priv->clk_mac))
 *  clk_disable_unprepare(bsp_priv->clk_mac);
-- 
2.7.0