evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ath10k: remove enum ath10k_swap_code_seg_bin_type

Browse source 
It's not needed for anything so just get rid of it.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Kalle Valo 2016-04-20 19:46:16 +03:00 • committed by Govind Singh
parent 7f7b580763
commit 5d3ccf9785
3 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/wireless/ath/ath10k/core.c
View file

@ -647,8 +647,7 @@ static int ath10k_download_fw(struct ath10k *ar)
data = ar->running_fw->fw_file.firmware_data; data = ar->running_fw->fw_file.firmware_data;
data_len = ar->running_fw->fw_file.firmware_len; data_len = ar->running_fw->fw_file.firmware_len;
ret = ath10k_swap_code_seg_configure(ar, ret = ath10k_swap_code_seg_configure(ar);
ATH10K_SWAP_CODE_SEG_BIN_TYPE_FW);
if (ret) { if (ret) {
ath10k_err(ar, "failed to configure fw code swap: %d\n", ath10k_err(ar, "failed to configure fw code swap: %d\n",
ret); ret);

22
drivers/net/wireless/ath/ath10k/swap.c
View file

@ -134,27 +134,17 @@ ath10k_swap_code_seg_alloc(struct ath10k *ar, size_t swap_bin_len)
return seg_info; return seg_info;
} }
int ath10k_swap_code_seg_configure(struct ath10k *ar, int ath10k_swap_code_seg_configure(struct ath10k *ar)
enum ath10k_swap_code_seg_bin_type type)
{ {
int ret; int ret;
struct ath10k_swap_code_seg_info *seg_info = NULL; struct ath10k_swap_code_seg_info *seg_info = NULL;
switch (type) { if (!ar->swap.firmware_swap_code_seg_info)
case ATH10K_SWAP_CODE_SEG_BIN_TYPE_FW:
if (!ar->swap.firmware_swap_code_seg_info)
return 0;
ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot found firmware code swap binary\n");
seg_info = ar->swap.firmware_swap_code_seg_info;
break;
default:
case ATH10K_SWAP_CODE_SEG_BIN_TYPE_OTP:
case ATH10K_SWAP_CODE_SEG_BIN_TYPE_UTF:
ath10k_warn(ar, "ignoring unknown code swap binary type %d\n",
type);
return 0; return 0;
}
ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot found firmware code swap binary\n");
seg_info = ar->swap.firmware_swap_code_seg_info;
ret = ath10k_bmi_write_memory(ar, seg_info->target_addr, ret = ath10k_bmi_write_memory(ar, seg_info->target_addr,
&seg_info->seg_hw_info, &seg_info->seg_hw_info,

9
drivers/net/wireless/ath/ath10k/swap.h
View file

@ -39,12 +39,6 @@ union ath10k_swap_code_seg_item {
struct ath10k_swap_code_seg_tail tail; struct ath10k_swap_code_seg_tail tail;
} __packed; } __packed;
enum ath10k_swap_code_seg_bin_type {
ATH10K_SWAP_CODE_SEG_BIN_TYPE_OTP,
ATH10K_SWAP_CODE_SEG_BIN_TYPE_FW,
ATH10K_SWAP_CODE_SEG_BIN_TYPE_UTF,
};
struct ath10k_swap_code_seg_hw_info { struct ath10k_swap_code_seg_hw_info {
/* Swap binary image size */ /* Swap binary image size */
__le32 swap_size; __le32 swap_size;
@ -64,8 +58,7 @@ struct ath10k_swap_code_seg_info {
dma_addr_t paddr[ATH10K_SWAP_CODE_SEG_NUM_SUPPORTED]; dma_addr_t paddr[ATH10K_SWAP_CODE_SEG_NUM_SUPPORTED];
}; };
int ath10k_swap_code_seg_configure(struct ath10k *ar, int ath10k_swap_code_seg_configure(struct ath10k *ar);
enum ath10k_swap_code_seg_bin_type type);
void ath10k_swap_code_seg_release(struct ath10k *ar); void ath10k_swap_code_seg_release(struct ath10k *ar);
int ath10k_swap_code_seg_init(struct ath10k *ar); int ath10k_swap_code_seg_init(struct ath10k *ar);