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, netdev@vger.kernel.org
Cc:     peter@n8pjl.ca, kernel-janitors@vger.kernel.org
Subject: [PATCH] wifi: rsi: Avoid defines prefixed with CONFIG
Date:   Mon, 16 Jan 2023 22:27:29 -0500
Message-id: <20230117032729.9578-1-peter@n8pjl.ca>
MIME-version: 1.0
Content-transfer-encoding: 8bit
Reporting-Meta: AAHiyYFu0MCxKBTa9Dl/SLLmtqNcWrAX7M4oL30YuiG0jhEemrrj8Isyt4Pz+FBl
 MNOofWk5sVY+4ISbEn5nsTpse/oJoQH6OH9XP6pes6Rt0D186h8WJ253nX5fq1KB
 5/TxIsZaYC0QqYTmhN6886HWFffEBger5daDBhWNj9wHM0gvwixSDRV+KuJG5Yrt
 sZ4F53807RnfQUoIAAYMDHQm4zu7h3OnFO6QR4rLQ+5XSHSe159YPIpi4ZAvSwGC
 A4CECoe7X8lNuGSVNt73ZSAtUuMIYvfOtpjKI6Lh4qp/P4wY8ztA0JifUXBTJPSy
 PXHEVCdDauOCdfnyx+tnYGKtyN1cYtXOxrqw+e7ivG1NnVwT9vD8wsQ/dx2zKW3f
 sBLSrGgNhdgXz2YDDPXALBDdT+Ec1joYJnv4AKytX5YIk3y/I2uK9rRgilzvrZhO Bw==
Precedence: bulk

To avoid confusion, it is best to only define CONFIG_* macros in Kconfig
files. Here we change the name of one define, which causes no change to
functionality.

Signed-off-by: Peter Lafreniere <peter@n8pjl.ca>
---
 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..d2e02d5da3c0 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, CONFIGURE_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, CONFIGURE_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..e1d9a4676f44 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 CONFIGURE_AUTO_READ_MODE	'R'
 #define JUMP_TO_ZERO_PC			'J'
 #define FW_LOADING_SUCCESSFUL		'S'
 #define LOADING_INITIATED		'1'
-- 
2.39.0