Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Peter Lafreniere <peter@n8pjl.ca>
To:     linux-wireless@vger.kernel.org
Cc:     Peter Lafreniere <peter@n8pjl.ca>, kernel-janitors@vger.kernel.org,
        kvalo@kernel.org
Subject: [PATCH v2] wifi: rsi: Avoid defines prefixed with CONFIG
Date:   Wed, 18 Jan 2023 13:53:53 -0500
Message-id: <20230118185353.2422-1-peter@n8pjl.ca>
MIME-version: 1.0
Content-transfer-encoding: 8bit
Reporting-Meta: AAHTI2vs1IyzD/vgTOy84Ji/NKLmHFHPaVHR0ZxgJPPMpuFfMChswkLkl3fhBTBo
 PiFREIAkb8Ia75rXvcZx19oB6BQ/n9ntMqX+S1DuK5u+V3xAp0azDFt7qhy3Opyc
 noOhyOzHBBl4e1GOjH9IVLP/mDUMdVOefjF34EhVBjNiytYj4On58uNRmpsCd7KP
 Gk2fsNA0rq4zbar06AfQ2ovyP+1ULE9yp91xtZ9S6b5E/iG0W6R0rIvhRte0gccU
 sK1j6ncbzTiTHM14FMgt2KmUPWlxoUzogFURCd3+YNjNvQIXsuN8AFt2mzHMsaSZ
 sVrmTX3MUUv9z4So6NUgsYDHJMlkifPd9pzADw+lnKQEQz8Zaln2wGNbGtsmDQ8z
 9WBJDrJB3HC4UUI9WqToJLkt/HueSCgviWt95QBzwmfgqqYtw4VcwXiJPeKtDjXH mkU=
Precedence: bulk

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 <peter@n8pjl.ca>
---
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