Commit 2180f7ac authored by Jeff Johnson's avatar Jeff Johnson Committed by Kalle Valo

wifi: ath12k: Remove ath12k_base::bd_api

Currently struct ath12k_base defines the member bd_api. However, this
member is only accessed within ath12k_core_fetch_bdf(). Since the
scope is local just to that one function, remove it from ath12k_base
and instead just use a local stack variable.

No functional changes, compile tested only.
Signed-off-by: default avatarJeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20231013-ath11k_bd_api-v1-2-3fefe4629706@quicinc.com
parent b4f70ac0
...@@ -360,6 +360,7 @@ int ath12k_core_fetch_board_data_api_1(struct ath12k_base *ab, ...@@ -360,6 +360,7 @@ int ath12k_core_fetch_board_data_api_1(struct ath12k_base *ab,
int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd) int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd)
{ {
char boardname[BOARD_NAME_SIZE]; char boardname[BOARD_NAME_SIZE];
int bd_api;
int ret; int ret;
ret = ath12k_core_create_board_name(ab, boardname, BOARD_NAME_SIZE); ret = ath12k_core_create_board_name(ab, boardname, BOARD_NAME_SIZE);
...@@ -368,12 +369,12 @@ int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd) ...@@ -368,12 +369,12 @@ int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd)
return ret; return ret;
} }
ab->bd_api = 2; bd_api = 2;
ret = ath12k_core_fetch_board_data_api_n(ab, bd, boardname); ret = ath12k_core_fetch_board_data_api_n(ab, bd, boardname);
if (!ret) if (!ret)
goto success; goto success;
ab->bd_api = 1; bd_api = 1;
ret = ath12k_core_fetch_board_data_api_1(ab, bd, ATH12K_DEFAULT_BOARD_FILE); ret = ath12k_core_fetch_board_data_api_1(ab, bd, ATH12K_DEFAULT_BOARD_FILE);
if (ret) { if (ret) {
ath12k_err(ab, "failed to fetch board-2.bin or board.bin from %s\n", ath12k_err(ab, "failed to fetch board-2.bin or board.bin from %s\n",
...@@ -382,7 +383,7 @@ int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd) ...@@ -382,7 +383,7 @@ int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd)
} }
success: success:
ath12k_dbg(ab, ATH12K_DBG_BOOT, "using board api %d\n", ab->bd_api); ath12k_dbg(ab, ATH12K_DBG_BOOT, "using board api %d\n", bd_api);
return 0; return 0;
} }
......
...@@ -737,7 +737,6 @@ struct ath12k_base { ...@@ -737,7 +737,6 @@ struct ath12k_base {
struct ath12k_wmi_target_cap_arg target_caps; struct ath12k_wmi_target_cap_arg target_caps;
u32 ext_service_bitmap[WMI_SERVICE_EXT_BM_SIZE]; u32 ext_service_bitmap[WMI_SERVICE_EXT_BM_SIZE];
bool pdevs_macaddr_valid; bool pdevs_macaddr_valid;
int bd_api;
const struct ath12k_hw_params *hw_params; const struct ath12k_hw_params *hw_params;
......
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