wilc1000: Rename SPI driver from "WILC_SPI" to "wilc1000_spi"

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>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20211209044411.3482259-2-davidm@egauge.net

diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c
index fc02217..e0871b8 100644 (file)
--- 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,
@@ -209,7 +211,7 @@ MODULE_DEVICE_TABLE(spi, wilc_spi_id);
 
 static struct spi_driver wilc_spi_driver = {
        .driver = {
-               .name = MODALIAS,
+               .name = SPI_MODALIAS,
                .of_match_table = wilc_of_match,
        },
        .id_table = wilc_spi_id,

diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.h b/drivers/net/wireless/microchip/wilc1000/wlan.h
index 13fde63..eb79781 100644 (file)
--- 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