Commit 01e5943a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by David S. Miller

net: fec: drop check for clk==NULL before calling clk_*

clk_prepare, clk_enable and their counterparts (at least the common clk
ones, but also most others) do check for the clk being NULL anyhow (and
return 0 then), so there is no gain when the caller checks, too.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarFugang Duan <fugang.duan@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9652dc2e
...@@ -1841,11 +1841,11 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable) ...@@ -1841,11 +1841,11 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
ret = clk_prepare_enable(fep->clk_ahb); ret = clk_prepare_enable(fep->clk_ahb);
if (ret) if (ret)
return ret; return ret;
if (fep->clk_enet_out) {
ret = clk_prepare_enable(fep->clk_enet_out); ret = clk_prepare_enable(fep->clk_enet_out);
if (ret) if (ret)
goto failed_clk_enet_out; goto failed_clk_enet_out;
}
if (fep->clk_ptp) { if (fep->clk_ptp) {
mutex_lock(&fep->ptp_clk_mutex); mutex_lock(&fep->ptp_clk_mutex);
ret = clk_prepare_enable(fep->clk_ptp); ret = clk_prepare_enable(fep->clk_ptp);
...@@ -1857,23 +1857,20 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable) ...@@ -1857,23 +1857,20 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
} }
mutex_unlock(&fep->ptp_clk_mutex); mutex_unlock(&fep->ptp_clk_mutex);
} }
if (fep->clk_ref) {
ret = clk_prepare_enable(fep->clk_ref); ret = clk_prepare_enable(fep->clk_ref);
if (ret) if (ret)
goto failed_clk_ref; goto failed_clk_ref;
}
} else { } else {
clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ahb);
if (fep->clk_enet_out) clk_disable_unprepare(fep->clk_enet_out);
clk_disable_unprepare(fep->clk_enet_out);
if (fep->clk_ptp) { if (fep->clk_ptp) {
mutex_lock(&fep->ptp_clk_mutex); mutex_lock(&fep->ptp_clk_mutex);
clk_disable_unprepare(fep->clk_ptp); clk_disable_unprepare(fep->clk_ptp);
fep->ptp_clk_on = false; fep->ptp_clk_on = false;
mutex_unlock(&fep->ptp_clk_mutex); mutex_unlock(&fep->ptp_clk_mutex);
} }
if (fep->clk_ref) clk_disable_unprepare(fep->clk_ref);
clk_disable_unprepare(fep->clk_ref);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment