ath11k: cleanup in core and qmi components

Commit Message

Karthikeyan periyasamy June 10, 2019, 9:38 a.m. UTC

Removed unused define ATH11K_TARGET_NAME and ATH11K_FW_READY_TIMEOUT_HZ.
Modify the api name from ath11k_qmi_firmware_indication() to
ath11k_core_qmi_firmware_ready() because its a core module functionality.

Signed-off-by: Karthikeyan Periyasamy <[e-mail]>
---
 drivers/net/wireless/ath/ath11k/core.c | 4 ++--
 drivers/net/wireless/ath/ath11k/core.h | 6 +-----
 drivers/net/wireless/ath/ath11k/qmi.c  | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

Comments

Kalle Valo June 12, 2019, 11:11 a.m. UTC | #1

Karthikeyan Periyasamy <[e-mail]> wrote:

> Removed unused define ATH11K_TARGET_NAME and ATH11K_FW_READY_TIMEOUT_HZ.
> Modify the api name from ath11k_qmi_firmware_indication() to
> ath11k_core_qmi_firmware_ready() because its a core module functionality.
> 
> Signed-off-by: Karthikeyan Periyasamy <[e-mail]>
> Signed-off-by: Kalle Valo <[e-mail]>

Patch applied to ath11k-bringup branch of ath.git, thanks.

108e62bbb49f ath11k: cleanup in core and qmi components

Patch

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index e3e6b64..928d47b 100644
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -582,7 +582,7 @@  static int ath11k_core_start(struct ath11k_base *sc,
 	return ret;
 }
 
-int ath11k_qmi_firmware_indication(struct ath11k_base *ab)
+int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab)
 {
 	int ret;
 
@@ -644,7 +644,7 @@  static int ath11k_core_reconfigure_on_crash(struct ath11k_base *sc)
 
 	clear_bit(ATH11K_FLAG_CRASH_FLUSH, &sc->dev_flags);
 
-	ret = ath11k_qmi_firmware_indication(sc);
+	ret = ath11k_core_qmi_firmware_ready(sc);
 	if (ret)
 		goto err_hal_srng_deinit;
 
diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index 6fc2942..7ebb5a4 100644
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -22,10 +22,6 @@ 
 
 #define SM(_v, _f) (((_v) << _f##_LSB) & _f##_MASK)
 
-#define ATH11K_TARGET_NAME "q6v5-wcss"
-
-#define ATH11K_FW_READY_TIMEOUT_HZ (5 * HZ)
-
 #define ATH11K_TX_MGMT_NUM_PENDING_MAX	512
 
 /* Map from pdev index to hw mac index */
@@ -813,7 +809,7 @@  struct ath11k_peer *ath11k_peer_find_by_addr(struct ath11k_base *ab,
 					     const u8 *addr);
 struct ath11k_peer *ath11k_peer_find_by_id(struct ath11k_base *ab,
 						  int peer_id);
-int ath11k_qmi_firmware_indication(struct ath11k_base *ab);
+int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab);
 int ath11k_core_init(struct ath11k_base *ath11k);
 void ath11k_core_deinit(struct ath11k_base *ath11k);
 struct ath11k_base *ath11k_core_alloc(struct device *dev);
diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c
index 79c6dde..cb9ed9c 100644
--- a/drivers/net/wireless/ath/ath11k/qmi.c
+++ b/drivers/net/wireless/ath/ath11k/qmi.c
@@ -2388,7 +2388,7 @@  static void ath11k_qmi_driver_event_work(struct work_struct *work)
 				break;
 			}
 
-			ath11k_qmi_firmware_indication(ab);
+			ath11k_core_qmi_firmware_ready(ab);
 			ab->qmi.cal_done = 1;
 			set_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags);