p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ath10k: rename board_data in struct ath10k 

I will use board_data for something else in the following patch
so I need to rename it.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Kalle Valo 2013-09-27 19:54:55 +03:00
parent 89b7e766c8
commit 365279167c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/ath/ath10k/core.c
View File

@ -215,7 +215,7 @@ static int ath10k_push_board_ext_data(struct ath10k *ar,
static int ath10k_download_board_data(struct ath10k *ar) static int ath10k_download_board_data(struct ath10k *ar)
{ {
const struct firmware *fw = ar->board_data; const struct firmware *fw = ar->board;
u32 board_data_size = QCA988X_BOARD_DATA_SZ; u32 board_data_size = QCA988X_BOARD_DATA_SZ;
u32 address; u32 address;
int ret; int ret;
@ -298,8 +298,8 @@ static int ath10k_download_fw(struct ath10k *ar)
static void ath10k_core_free_firmware_files(struct ath10k *ar) static void ath10k_core_free_firmware_files(struct ath10k *ar)
{ {
if (ar->board_data && !IS_ERR(ar->board_data)) if (ar->board && !IS_ERR(ar->board))
release_firmware(ar->board_data); release_firmware(ar->board);
if (ar->otp && !IS_ERR(ar->otp)) if (ar->otp && !IS_ERR(ar->otp))
release_firmware(ar->otp); release_firmware(ar->otp);
@ -307,7 +307,7 @@ static void ath10k_core_free_firmware_files(struct ath10k *ar)
if (ar->firmware && !IS_ERR(ar->firmware)) if (ar->firmware && !IS_ERR(ar->firmware))
release_firmware(ar->firmware); release_firmware(ar->firmware);
ar->board_data = NULL; ar->board = NULL;
ar->otp = NULL; ar->otp = NULL;
ar->firmware = NULL; ar->firmware = NULL;
} }
@ -326,11 +326,11 @@ static int ath10k_core_fetch_firmware_files(struct ath10k *ar)
return -EINVAL; return -EINVAL;
} }
ar->board_data = ath10k_fetch_fw_file(ar, ar->board = ath10k_fetch_fw_file(ar,
ar->hw_params.fw.dir, ar->hw_params.fw.dir,
ar->hw_params.fw.board); ar->hw_params.fw.board);
if (IS_ERR(ar->board_data)) { if (IS_ERR(ar->board)) {
ret = PTR_ERR(ar->board_data); ret = PTR_ERR(ar->board);
ath10k_err("could not fetch board data (%d)\n", ret); ath10k_err("could not fetch board data (%d)\n", ret);
goto err; goto err;
} }

2
drivers/net/wireless/ath/ath10k/core.h
View File

@ -347,7 +347,7 @@ struct ath10k {
} fw; } fw;
} hw_params; } hw_params;
const struct firmware *board_data; const struct firmware *board;
const struct firmware *otp; const struct firmware *otp;
const struct firmware *firmware; const struct firmware *firmware;