From 6b5472d4f1588e3eea0c3270ec53766739ae4c2e Mon Sep 17 00:00:00 2001 From: Zhang Changzhong Date: Wed, 9 Sep 2020 22:09:00 +0800 Subject: [PATCH] net: stmmac: dwmac-intel-plat: remove redundant null check before clk_disable_unprepare() Because clk_prepare_enable() and clk_disable_unprepare() already checked NULL clock parameter, so the additional checks are unnecessary, just remove them. Reported-by: Hulk Robot Signed-off-by: Zhang Changzhong Signed-off-by: David S. Miller --- drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c index ccac7bf2a9d3a..b1323d5c95b58 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c @@ -149,9 +149,7 @@ static int intel_eth_plat_probe(struct platform_device *pdev) ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); if (ret) { - if (dwmac->tx_clk) - clk_disable_unprepare(dwmac->tx_clk); - + clk_disable_unprepare(dwmac->tx_clk); goto err_remove_config_dt; } @@ -169,9 +167,7 @@ static int intel_eth_plat_remove(struct platform_device *pdev) int ret; ret = stmmac_pltfr_remove(pdev); - - if (dwmac->tx_clk) - clk_disable_unprepare(dwmac->tx_clk); + clk_disable_unprepare(dwmac->tx_clk); return ret; }