diff mbox series

[28/31] staging: wfx: fix firmware location

Message ID 20220113085524.1110708-29-Jerome.Pouiller@silabs.com (mailing list archive)
State Not Applicable
Delegated to: Johannes Berg
Headers show
Series staging/wfx: apply suggestions from the linux-wireless review | expand

Commit Message

Jérôme Pouiller Jan. 13, 2022, 8:55 a.m. UTC 
From: Jérôme Pouiller <jerome.pouiller@silabs.com>

There is currently, a mismatch between the location of the firmware in
linux-firmware and the path written in the driver.

We take this opportunity to relocate the WF200 firmware in wfx/ instead
of silabs/.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
 drivers/staging/wfx/bus_sdio.c | 16 ++++++++--------
 drivers/staging/wfx/bus_spi.c  | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)
diff mbox series

Patch

diff --git a/drivers/staging/wfx/bus_sdio.c b/drivers/staging/wfx/bus_sdio.c
index 361585763f30..6ead6957b751 100644
--- a/drivers/staging/wfx/bus_sdio.c
+++ b/drivers/staging/wfx/bus_sdio.c
@@ -22,23 +22,23 @@ 
 #include "bh.h"
 
 static const struct wfx_platform_data pdata_wf200 = {
-	.file_fw = "wfm_wf200",
-	.file_pds = "wf200.pds",
+	.file_fw = "wfx/wfm_wf200",
+	.file_pds = "wfx/wf200.pds",
 };
 
 static const struct wfx_platform_data pdata_brd4001a = {
-	.file_fw = "wfm_wf200",
-	.file_pds = "brd4001a.pds",
+	.file_fw = "wfx/wfm_wf200",
+	.file_pds = "wfx/brd4001a.pds",
 };
 
 static const struct wfx_platform_data pdata_brd8022a = {
-	.file_fw = "wfm_wf200",
-	.file_pds = "brd8022a.pds",
+	.file_fw = "wfx/wfm_wf200",
+	.file_pds = "wfx/brd8022a.pds",
 };
 
 static const struct wfx_platform_data pdata_brd8023a = {
-	.file_fw = "wfm_wf200",
-	.file_pds = "brd8023a.pds",
+	.file_fw = "wfx/wfm_wf200",
+	.file_pds = "wfx/brd8023a.pds",
 };
 
 /* Legacy DT don't use it */
diff --git a/drivers/staging/wfx/bus_spi.c b/drivers/staging/wfx/bus_spi.c
index 9aa52d76cdda..6b4f9fff8b44 100644
--- a/drivers/staging/wfx/bus_spi.c
+++ b/drivers/staging/wfx/bus_spi.c
@@ -24,26 +24,26 @@ 
 #define SET_READ 0x8000         /* usage: or operation */
 
 static const struct wfx_platform_data pdata_wf200 = {
-	.file_fw = "wfm_wf200",
-	.file_pds = "wf200.pds",
+	.file_fw = "wfx/wfm_wf200",
+	.file_pds = "wfx/wf200.pds",
 	.use_rising_clk = true,
 };
 
 static const struct wfx_platform_data pdata_brd4001a = {
-	.file_fw = "wfm_wf200",
-	.file_pds = "brd4001a.pds",
+	.file_fw = "wfx/wfm_wf200",
+	.file_pds = "wfx/brd4001a.pds",
 	.use_rising_clk = true,
 };
 
 static const struct wfx_platform_data pdata_brd8022a = {
-	.file_fw = "wfm_wf200",
-	.file_pds = "brd8022a.pds",
+	.file_fw = "wfx/wfm_wf200",
+	.file_pds = "wfx/brd8022a.pds",
 	.use_rising_clk = true,
 };
 
 static const struct wfx_platform_data pdata_brd8023a = {
-	.file_fw = "wfm_wf200",
-	.file_pds = "brd8023a.pds",
+	.file_fw = "wfx/wfm_wf200",
+	.file_pds = "wfx/brd8023a.pds",
 	.use_rising_clk = true,
 };