diff mbox series

[1/4] wilc1000: Rename SPI driver from "WILC_SPI" to "wilc1000_spi"

Message ID 20211209044411.3482259-2-davidm@egauge.net (mailing list archive)
State Accepted
Commit 4347d34e6a7699cb61a8bc19b86e460d6b67e5fb
Delegated to: Kalle Valo
Headers show
Series wilc1000: use Linux-style for system-visible names | expand

Commit Message

David Mosberger-Tang Dec. 9, 2021, 4:44 a.m. UTC
The name "wilc1000_spi" follows normal Linux conventions and also is
analogous to the SDIO driver, which uses "wilc1000_sdio".

Signed-off-by: David Mosberger-Tang <davidm@egauge.net>
---
 drivers/net/wireless/microchip/wilc1000/spi.c  | 4 +++-
 drivers/net/wireless/microchip/wilc1000/wlan.h | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Kalle Valo Dec. 14, 2021, 6:46 p.m. UTC | #1
David Mosberger-Tang <davidm@egauge.net> wrote:

> The name "wilc1000_spi" follows normal Linux conventions and also is
> analogous to the SDIO driver, which uses "wilc1000_sdio".
> 
> Signed-off-by: David Mosberger-Tang <davidm@egauge.net>

4 patches applied to wireless-drivers-next.git, thanks.

4347d34e6a76 wilc1000: Rename SPI driver from "WILC_SPI" to "wilc1000_spi"
30e08bc0a94c wilc1000: Rename irq handler from "WILC_IRQ" to netdev name
3cc23932ba2a wilc1000: Rename tx task from "K_TXQ_TASK" to NETDEV-tx
09ed8bfc5215 wilc1000: Rename workqueue from "WILC_wq" to "NETDEV-wq"
diff mbox series

Patch

diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c
index 640850f989dd..69c901395329 100644
--- a/drivers/net/wireless/microchip/wilc1000/spi.c
+++ b/drivers/net/wireless/microchip/wilc1000/spi.c
@@ -12,6 +12,8 @@ 
 #include "netdev.h"
 #include "cfg80211.h"
 
+#define SPI_MODALIAS		"wilc1000_spi"
+
 static bool enable_crc7;	/* protect SPI commands with CRC7 */
 module_param(enable_crc7, bool, 0644);
 MODULE_PARM_DESC(enable_crc7,
@@ -205,7 +207,7 @@  MODULE_DEVICE_TABLE(of, wilc_of_match);
 
 static struct spi_driver wilc_spi_driver = {
 	.driver = {
-		.name = MODALIAS,
+		.name = SPI_MODALIAS,
 		.of_match_table = wilc_of_match,
 	},
 	.probe =  wilc_bus_probe,
diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.h b/drivers/net/wireless/microchip/wilc1000/wlan.h
index 13fde636aa0e..eb7978166d73 100644
--- a/drivers/net/wireless/microchip/wilc1000/wlan.h
+++ b/drivers/net/wireless/microchip/wilc1000/wlan.h
@@ -213,8 +213,6 @@ 
 #define WILC_RX_BUFF_SIZE	(96 * 1024)
 #define WILC_TX_BUFF_SIZE	(64 * 1024)
 
-#define MODALIAS		"WILC_SPI"
-
 #define NQUEUES			4
 #define AC_BUFFER_SIZE		1000