2023-01-18 18:58:25

by Peter Lafreniere

Subject: [PATCH v2] wifi: rsi: Avoid defines prefixed with CONFIG

Macros prefixed with CONFIG_ are intended to be defined only by
Kconfig scripts. Here we remove the prefix from the
CONFIG_AUTO_READ_MODE define to avoid confusion when reading the code.

This causes no change to functionality.

Signed-off-by: Peter Lafreniere <[email protected]>
---
v1 -> v2:
- Use AUTO_READ_MODE instead of CONFIGURE_AUTO_READ_MODE
- Remove netdev from cc list

drivers/net/wireless/rsi/rsi_91x_hal.c | 4 ++--
drivers/net/wireless/rsi/rsi_hal.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/rsi/rsi_91x_hal.c b/drivers/net/wireless/rsi/rsi_91x_hal.c
index c7460fbba014..d4489b943873 100644
--- a/drivers/net/wireless/rsi/rsi_91x_hal.c
+++ b/drivers/net/wireless/rsi/rsi_91x_hal.c
@@ -894,7 +894,7 @@ static int rsi_load_9113_firmware(struct rsi_hw *adapter)
struct ta_metadata *metadata_p;
int status;

- status = bl_cmd(adapter, CONFIG_AUTO_READ_MODE, CMD_PASS,
+ status = bl_cmd(adapter, AUTO_READ_MODE, CMD_PASS,
"AUTO_READ_CMD");
if (status < 0)
return status;
@@ -984,7 +984,7 @@ static int rsi_load_9113_firmware(struct rsi_hw *adapter)
}
rsi_dbg(ERR_ZONE, "Firmware upgrade failed\n");

- status = bl_cmd(adapter, CONFIG_AUTO_READ_MODE, CMD_PASS,
+ status = bl_cmd(adapter, AUTO_READ_MODE, CMD_PASS,
"AUTO_READ_MODE");
if (status)
goto fail;
diff --git a/drivers/net/wireless/rsi/rsi_hal.h b/drivers/net/wireless/rsi/rsi_hal.h
index 5b07262a9740..479b1b0b57a6 100644
--- a/drivers/net/wireless/rsi/rsi_hal.h
+++ b/drivers/net/wireless/rsi/rsi_hal.h
@@ -69,7 +69,7 @@
#define EOF_REACHED 'E'
#define CHECK_CRC 'K'
#define POLLING_MODE 'P'
-#define CONFIG_AUTO_READ_MODE 'R'
+#define AUTO_READ_MODE 'R'
#define JUMP_TO_ZERO_PC 'J'
#define FW_LOADING_SUCCESSFUL 'S'
#define LOADING_INITIATED '1'
--
2.39.0

2023-02-13 17:24:22

by Kalle Valo

Subject: Re: [PATCH v2] wifi: rsi: Avoid defines prefixed with CONFIG

Peter Lafreniere <[email protected]> wrote:

> Macros prefixed with CONFIG_ are intended to be defined only by
> Kconfig scripts. Here we remove the prefix from the
> CONFIG_AUTO_READ_MODE define to avoid confusion when reading the code.
>
> This causes no change to functionality.
>
> Signed-off-by: Peter Lafreniere <[email protected]>

Patch applied to wireless-next.git, thanks.

c6e3dc99fd32 wifi: rsi: Avoid defines prefixed with CONFIG

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches