ath10k: share board file loading code across FW APIs

There's no need to implement the same thing twice.
Reduce code duplication.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 2d64926c8228fb0fa2e4ee21a80c9161ba1322f6..70f5b7acc41105fbc83360fa6dd5917a3a206e62 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -482,17 +482,12 @@ static int ath10k_fetch_cal_file(struct ath10k *ar)
        return 0;
 }
 
-static int ath10k_core_fetch_firmware_api_1(struct ath10k *ar)
+static int ath10k_core_fetch_board_file(struct ath10k *ar)
 {
-       int ret = 0;
-
-       if (ar->hw_params.fw.fw == NULL) {
-               ath10k_err(ar, "firmware file not defined\n");
-               return -EINVAL;
-       }
+       int ret;
 
-       if (ar->hw_params.fw.board == NULL) {
-               ath10k_err(ar, "board data file not defined");
+       if (!ar->hw_params.fw.board) {
+               ath10k_err(ar, "failed to find board file fw entry\n");
                return -EINVAL;
        }
 
@@ -501,13 +496,25 @@ static int ath10k_core_fetch_firmware_api_1(struct ath10k *ar)
                                         ar->hw_params.fw.board);
        if (IS_ERR(ar->board)) {
                ret = PTR_ERR(ar->board);
-               ath10k_err(ar, "could not fetch board data (%d)\n", ret);
-               goto err;
+               ath10k_err(ar, "failed to fetch board data: %d\n", ret);
+               return ret;
        }
 
        ar->board_data = ar->board->data;
        ar->board_len = ar->board->size;
 
+       return 0;
+}
+
+static int ath10k_core_fetch_firmware_api_1(struct ath10k *ar)
+{
+       int ret = 0;
+
+       if (ar->hw_params.fw.fw == NULL) {
+               ath10k_err(ar, "firmware file not defined\n");
+               return -EINVAL;
+       }
+
        ar->firmware = ath10k_fetch_fw_file(ar,
                                            ar->hw_params.fw.dir,
                                            ar->hw_params.fw.fw);
@@ -706,27 +713,6 @@ static int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name)
                goto err;
        }
 
-       /* now fetch the board file */
-       if (ar->hw_params.fw.board == NULL) {
-               ath10k_err(ar, "board data file not defined");
-               ret = -EINVAL;
-               goto err;
-       }
-
-       ar->board = ath10k_fetch_fw_file(ar,
-                                        ar->hw_params.fw.dir,
-                                        ar->hw_params.fw.board);
-       if (IS_ERR(ar->board)) {
-               ret = PTR_ERR(ar->board);
-               ath10k_err(ar, "could not fetch board data '%s/%s' (%d)\n",
-                          ar->hw_params.fw.dir, ar->hw_params.fw.board,
-                          ret);
-               goto err;
-       }
-
-       ar->board_data = ar->board->data;
-       ar->board_len = ar->board->size;
-
        return 0;
 
 err:
@@ -741,6 +727,12 @@ static int ath10k_core_fetch_firmware_files(struct ath10k *ar)
        /* calibration file is optional, don't check for any errors */
        ath10k_fetch_cal_file(ar);
 
+       ret = ath10k_core_fetch_board_file(ar);
+       if (ret) {
+               ath10k_err(ar, "failed to fetch board file: %d\n", ret);
+               return ret;
+       }
+
        ar->fw_api = 5;
        ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);