ath11k: don't use defines in hw_params

These defines are not used anywhere else so to avoid extra indirection add the
values directly to hw_params.

No functional changes. Compile tested only.

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1592316055-24958-12-git-send-email-kvalo@codeaurora.org

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index 84a566dffad9c29b632d578ec910af397661ce19..38e830a2395b89cb9b80e8986b02df2a3df11edd 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -23,8 +23,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
                .name = "ipq8074 hw2.0",
                .fw = {
                        .dir = "IPQ8074/hw2.0",
-                       .board_size = IPQ8074_MAX_BOARD_DATA_SZ,
-                       .cal_size =  IPQ8074_MAX_CAL_DATA_SZ,
+                       .board_size = 256 * 1024,
+                       .cal_size = 256 * 1024,
                },
                .max_radios = 3,
                .bdf_addr = 0x4B0C0000,

diff --git a/drivers/net/wireless/ath/ath11k/hw.h b/drivers/net/wireless/ath/ath11k/hw.h
index 828c8c076218393302afc397f234f411cdb6830b..f31d53f6adb824272c32b5970a0f769232b3b0b8 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/hw.h
+++ b/drivers/net/wireless/ath/ath11k/hw.h
@@ -68,10 +68,6 @@
 
 #define ATH11K_FW_DIR                  "ath11k"
 
-/* IPQ8074 definitions */
-#define IPQ8074_MAX_BOARD_DATA_SZ      (256 * 1024)
-#define IPQ8074_MAX_CAL_DATA_SZ                IPQ8074_MAX_BOARD_DATA_SZ
-
 #define ATH11K_BOARD_MAGIC             "QCA-ATH11K-BOARD"
 #define ATH11K_BOARD_API2_FILE         "board-2.bin"
 #define ATH11K_DEFAULT_BOARD_FILE      "board.bin"