diff mbox

ath10k: hw: make consistent usage of ATH10K_FW_DIR in paths

Message ID 20180509075633.3030-1-marcus.folkesson@gmail.com (mailing list archive)
State Accepted
Commit 0be928850dac4dc3f9f4e0a9966b6c809557a494
Delegated to: Kalle Valo
Headers show

Commit Message

Marcus Folkesson May 9, 2018, 7:56 a.m. UTC
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
 drivers/net/wireless/ath/ath10k/hw.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Kalle Valo May 12, 2018, 9:10 a.m. UTC | #1
Marcus Folkesson <marcus.folkesson@gmail.com> writes:

> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>

I don't like empty commit logs so I added this in the pending branch:

  ath10k: hw: make consistent usage of ATH10K_FW_DIR in paths

  For some reason not all entries used ATH10K_FW_DIR so fix that. No functional 
  changes.
Kalle Valo May 12, 2018, 9:24 a.m. UTC | #2
Marcus Folkesson <marcus.folkesson@gmail.com> wrote:

> For some reason not all entries used ATH10K_FW_DIR so fix that. No functional
> changes.
> 
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Patch applied to ath-next branch of ath.git, thanks.

0be928850dac ath10k: hw: make consistent usage of ATH10K_FW_DIR in paths
diff mbox

Patch

diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
index b8bdabe73073..23467e9fefeb 100644
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -85,11 +85,11 @@  enum qca9377_chip_id_rev {
 	QCA9377_HW_1_1_CHIP_ID_REV = 0x1,
 };
 
-#define QCA6174_HW_2_1_FW_DIR		"ath10k/QCA6174/hw2.1"
+#define QCA6174_HW_2_1_FW_DIR		ATH10K_FW_DIR "/QCA6174/hw2.1"
 #define QCA6174_HW_2_1_BOARD_DATA_FILE	"board.bin"
 #define QCA6174_HW_2_1_PATCH_LOAD_ADDR	0x1234
 
-#define QCA6174_HW_3_0_FW_DIR		"ath10k/QCA6174/hw3.0"
+#define QCA6174_HW_3_0_FW_DIR		ATH10K_FW_DIR "/QCA6174/hw3.0"
 #define QCA6174_HW_3_0_BOARD_DATA_FILE	"board.bin"
 #define QCA6174_HW_3_0_PATCH_LOAD_ADDR	0x1234