|
@@ -1841,11 +1841,11 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
|
|
|
ret = clk_prepare_enable(fep->clk_ahb);
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
- if (fep->clk_enet_out) {
|
|
|
- ret = clk_prepare_enable(fep->clk_enet_out);
|
|
|
- if (ret)
|
|
|
- goto failed_clk_enet_out;
|
|
|
- }
|
|
|
+
|
|
|
+ ret = clk_prepare_enable(fep->clk_enet_out);
|
|
|
+ if (ret)
|
|
|
+ goto failed_clk_enet_out;
|
|
|
+
|
|
|
if (fep->clk_ptp) {
|
|
|
mutex_lock(&fep->ptp_clk_mutex);
|
|
|
ret = clk_prepare_enable(fep->clk_ptp);
|
|
@@ -1857,23 +1857,20 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable)
|
|
|
}
|
|
|
mutex_unlock(&fep->ptp_clk_mutex);
|
|
|
}
|
|
|
- if (fep->clk_ref) {
|
|
|
- ret = clk_prepare_enable(fep->clk_ref);
|
|
|
- if (ret)
|
|
|
- goto failed_clk_ref;
|
|
|
- }
|
|
|
+
|
|
|
+ ret = clk_prepare_enable(fep->clk_ref);
|
|
|
+ if (ret)
|
|
|
+ goto failed_clk_ref;
|
|
|
} else {
|
|
|
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) {
|
|
|
mutex_lock(&fep->ptp_clk_mutex);
|
|
|
clk_disable_unprepare(fep->clk_ptp);
|
|
|
fep->ptp_clk_on = false;
|
|
|
mutex_unlock(&fep->ptp_clk_mutex);
|
|
|
}
|
|
|
- if (fep->clk_ref)
|
|
|
- clk_disable_unprepare(fep->clk_ref);
|
|
|
+ clk_disable_unprepare(fep->clk_ref);
|
|
|
}
|
|
|
|
|
|
return 0;
|