Skip to contentSkip to conversation

wl1251: rename spi device to wl1251

PATCH In review Kalle Valo 2 participants 3 messages Oct 13, 2009 – Oct 17, 2009 Networking drivers (wireless)

lore
Share & tools
lore

Kalle Valo

author
#0 lore raw

PATCH 1/1 wl1251: rename spi device to wl1251

From: Kalle Valo <[email protected]>

During rename of the driver from wl12xx to wl1251 the spi device name was accidentally left as wl12xx. Rename it to wl1251 which is the proper name of the driver.

---

 drivers/net/wireless/wl12xx/wl1251_main.c |    2 +-
 drivers/net/wireless/wl12xx/wl1251_spi.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/wl12xx/wl1251_main.c +1 -1
index 1103256..23ac503 100644
@@ -1426,4 +1426,4 @@ EXPORT_SYMBOL_GPL(wl1251_free_hw);
 MODULE_DESCRIPTION("TI wl1251 Wireles LAN Driver Core");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Kalle Valo <[email protected]>");
-MODULE_ALIAS("spi:wl12xx");
+MODULE_ALIAS("spi:wl1251");
drivers/net/wireless/wl12xx/wl1251_spi.c +1 -1
index 14eff2b..2cf8a21 100644
@@ -307,7 +307,7 @@ static int __devexit wl1251_spi_remove(struct spi_device *spi)
 
 static struct spi_driver wl1251_spi_driver = {
 	.driver = {
-		.name		= "wl12xx",
+		.name		= "wl1251",
 		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},
maintainer
#1 lore raw
Quoted 7 lines · Kalle Valo
drivers/net/wireless/wl12xx/wl1251_main.c +1 -1
-MODULE_ALIAS("spi:wl12xx");
+MODULE_ALIAS("spi:wl1251");
drivers/net/wireless/wl12xx/wl1251_spi.c +0 -0
index 14eff2b..2cf8a21 100644

drivers/net/wireless/wl12xx/wl1251_spi.c static int __devexit wl1251_spi_remove(struct spi_device *spi) · line 312

Quoted 7 lines
drivers/net/wireless/wl12xx/wl1251_spi.c +1 -1
@@ -307,7 +307,7 @@ static int __devexit wl1251_spi_remove(struct spi_device *spi)
 
 static struct spi_driver wl1251_spi_driver = {
 	.driver = {
-		.name		= "wl12xx",
+		.name		= "wl1251",
 		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,

IIRC there's a preprocessor symbol for the module name (MODULE_NAME?)

johannes

author
#2 lore raw
Quoted 8 lines · Johannes Berg

drivers/net/wireless/wl12xx/wl1251_spi.c static int __devexit wl1251_spi_remove(struct spi_device *spi) · line 312

Quoted 6 lines

static struct spi_driver wl1251_spi_driver = {

drivers/net/wireless/wl12xx/wl1251_spi.c +1 -1
 	.driver = {
-		.name		= "wl12xx",
+		.name		= "wl1251",
 		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,

IIRC there's a preprocessor symbol for the module name (MODULE_NAME?)

Yes, there is DRIVER_NAME macro. I'll send a new patch on top of this one. Thanks.

Signature · 1 line
Kalle Valo