diff mbox series

ath10k: move enable_pll_clk call to ath10k_core_start()

Message ID 1597421745-4329-1-git-send-email-kvalo@codeaurora.org (mailing list archive)
State Accepted
Commit ad0dc0426468852a97067980879ca035fe138a6d
Delegated to: Kalle Valo
Headers show
Series ath10k: move enable_pll_clk call to ath10k_core_start() | expand

Commit Message

Kalle Valo Aug. 14, 2020, 4:15 p.m. UTC
There's no reason to have call for enable_pll_clk in ath10k_bmi_start(), move
it to ath10k_core_start() instead. This way it's possible to call
ath10k_bmi_start() from sdio.c during firmware dump creation. And also the
function call is more visible when it's in core.c.

No functional changes, compile tested only.

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
---
 drivers/net/wireless/ath/ath10k/bmi.c  | 8 --------
 drivers/net/wireless/ath/ath10k/core.c | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

Comments

Kalle Valo Aug. 18, 2020, 9:42 a.m. UTC | #1
Kalle Valo <kvalo@codeaurora.org> wrote:

> There's no reason to have call for enable_pll_clk in ath10k_bmi_start(), move
> it to ath10k_core_start() instead. This way it's possible to call
> ath10k_bmi_start() from sdio.c during firmware dump creation. And also the
> function call is more visible when it's in core.c.
> 
> No functional changes, compile tested only.
> 
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Patch applied to ath-next branch of ath.git, thanks.

ad0dc0426468 ath10k: move enable_pll_clk call to ath10k_core_start()
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath10k/bmi.c b/drivers/net/wireless/ath/ath10k/bmi.c
index 5b6db6e66f65..8b9d537c8900 100644
--- a/drivers/net/wireless/ath/ath10k/bmi.c
+++ b/drivers/net/wireless/ath/ath10k/bmi.c
@@ -12,17 +12,9 @@ 
 
 void ath10k_bmi_start(struct ath10k *ar)
 {
-	int ret;
-
 	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi start\n");
 
 	ar->bmi.done_sent = false;
-
-	/* Enable hardware clock to speed up firmware download */
-	if (ar->hw_params.hw_ops->enable_pll_clk) {
-		ret = ar->hw_params.hw_ops->enable_pll_clk(ar);
-		ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi enable pll ret %d\n", ret);
-	}
 }
 
 int ath10k_bmi_done(struct ath10k *ar)
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 22b6937ac225..029ae1c4d8dc 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -2614,6 +2614,13 @@  int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,
 		      ar->running_fw->fw_file.fw_features)) {
 		ath10k_bmi_start(ar);
 
+		/* Enable hardware clock to speed up firmware download */
+		if (ar->hw_params.hw_ops->enable_pll_clk) {
+			status = ar->hw_params.hw_ops->enable_pll_clk(ar);
+			ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot enable pll ret %d\n",
+				   status);
+		}
+
 		if (ath10k_init_configure_target(ar)) {
 			status = -EINVAL;
 			goto err;