diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2007-11-27 15:47:34 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:05:04 -0500 |
commit | 2360157c413b06fe2958a051daeab7bac68f6588 (patch) | |
tree | c902030053c675dfabc76e14e0def772dc0e0202 /drivers | |
parent | a293ee990d0a3ba945eda5d0861969d0ca7ce62c (diff) |
rt2x00: Replace DRV_NAME with KBUILD_MODNAME
DRV_NAME was always set to the KBUILD_MODNAME value,
lets clean everything up by removing DRV_NAME and just
use KBUILD_MODNAME directly.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2400pci.c | 9 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2500pci.c | 9 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2500usb.c | 9 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00config.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00debug.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00firmware.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00pci.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00rfkill.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00usb.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 9 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 9 |
14 files changed, 11 insertions, 77 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c index bdf3edc6524..6d3cdaf5903 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/rt2x00/rt2400pci.c | |||
@@ -24,11 +24,6 @@ | |||
24 | Supported chipsets: RT2460. | 24 | Supported chipsets: RT2460. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | /* | ||
28 | * Set enviroment defines for rt2x00.h | ||
29 | */ | ||
30 | #define DRV_NAME "rt2400pci" | ||
31 | |||
32 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
33 | #include <linux/etherdevice.h> | 28 | #include <linux/etherdevice.h> |
34 | #include <linux/init.h> | 29 | #include <linux/init.h> |
@@ -1610,7 +1605,7 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = { | |||
1610 | }; | 1605 | }; |
1611 | 1606 | ||
1612 | static const struct rt2x00_ops rt2400pci_ops = { | 1607 | static const struct rt2x00_ops rt2400pci_ops = { |
1613 | .name = DRV_NAME, | 1608 | .name = KBUILD_MODNAME, |
1614 | .rxd_size = RXD_DESC_SIZE, | 1609 | .rxd_size = RXD_DESC_SIZE, |
1615 | .txd_size = TXD_DESC_SIZE, | 1610 | .txd_size = TXD_DESC_SIZE, |
1616 | .eeprom_size = EEPROM_SIZE, | 1611 | .eeprom_size = EEPROM_SIZE, |
@@ -1638,7 +1633,7 @@ MODULE_DEVICE_TABLE(pci, rt2400pci_device_table); | |||
1638 | MODULE_LICENSE("GPL"); | 1633 | MODULE_LICENSE("GPL"); |
1639 | 1634 | ||
1640 | static struct pci_driver rt2400pci_driver = { | 1635 | static struct pci_driver rt2400pci_driver = { |
1641 | .name = DRV_NAME, | 1636 | .name = KBUILD_MODNAME, |
1642 | .id_table = rt2400pci_device_table, | 1637 | .id_table = rt2400pci_device_table, |
1643 | .probe = rt2x00pci_probe, | 1638 | .probe = rt2x00pci_probe, |
1644 | .remove = __devexit_p(rt2x00pci_remove), | 1639 | .remove = __devexit_p(rt2x00pci_remove), |
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index b6bb9644e25..a6234547261 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c | |||
@@ -24,11 +24,6 @@ | |||
24 | Supported chipsets: RT2560. | 24 | Supported chipsets: RT2560. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | /* | ||
28 | * Set enviroment defines for rt2x00.h | ||
29 | */ | ||
30 | #define DRV_NAME "rt2500pci" | ||
31 | |||
32 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
33 | #include <linux/etherdevice.h> | 28 | #include <linux/etherdevice.h> |
34 | #include <linux/init.h> | 29 | #include <linux/init.h> |
@@ -1903,7 +1898,7 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = { | |||
1903 | }; | 1898 | }; |
1904 | 1899 | ||
1905 | static const struct rt2x00_ops rt2500pci_ops = { | 1900 | static const struct rt2x00_ops rt2500pci_ops = { |
1906 | .name = DRV_NAME, | 1901 | .name = KBUILD_MODNAME, |
1907 | .rxd_size = RXD_DESC_SIZE, | 1902 | .rxd_size = RXD_DESC_SIZE, |
1908 | .txd_size = TXD_DESC_SIZE, | 1903 | .txd_size = TXD_DESC_SIZE, |
1909 | .eeprom_size = EEPROM_SIZE, | 1904 | .eeprom_size = EEPROM_SIZE, |
@@ -1931,7 +1926,7 @@ MODULE_DEVICE_TABLE(pci, rt2500pci_device_table); | |||
1931 | MODULE_LICENSE("GPL"); | 1926 | MODULE_LICENSE("GPL"); |
1932 | 1927 | ||
1933 | static struct pci_driver rt2500pci_driver = { | 1928 | static struct pci_driver rt2500pci_driver = { |
1934 | .name = DRV_NAME, | 1929 | .name = KBUILD_MODNAME, |
1935 | .id_table = rt2500pci_device_table, | 1930 | .id_table = rt2500pci_device_table, |
1936 | .probe = rt2x00pci_probe, | 1931 | .probe = rt2x00pci_probe, |
1937 | .remove = __devexit_p(rt2x00pci_remove), | 1932 | .remove = __devexit_p(rt2x00pci_remove), |
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index e9f99c48ef2..15ab4b20d06 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c | |||
@@ -24,11 +24,6 @@ | |||
24 | Supported chipsets: RT2570. | 24 | Supported chipsets: RT2570. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | /* | ||
28 | * Set enviroment defines for rt2x00.h | ||
29 | */ | ||
30 | #define DRV_NAME "rt2500usb" | ||
31 | |||
32 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
33 | #include <linux/etherdevice.h> | 28 | #include <linux/etherdevice.h> |
34 | #include <linux/init.h> | 29 | #include <linux/init.h> |
@@ -1790,7 +1785,7 @@ static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = { | |||
1790 | }; | 1785 | }; |
1791 | 1786 | ||
1792 | static const struct rt2x00_ops rt2500usb_ops = { | 1787 | static const struct rt2x00_ops rt2500usb_ops = { |
1793 | .name = DRV_NAME, | 1788 | .name = KBUILD_MODNAME, |
1794 | .rxd_size = RXD_DESC_SIZE, | 1789 | .rxd_size = RXD_DESC_SIZE, |
1795 | .txd_size = TXD_DESC_SIZE, | 1790 | .txd_size = TXD_DESC_SIZE, |
1796 | .eeprom_size = EEPROM_SIZE, | 1791 | .eeprom_size = EEPROM_SIZE, |
@@ -1862,7 +1857,7 @@ MODULE_DEVICE_TABLE(usb, rt2500usb_device_table); | |||
1862 | MODULE_LICENSE("GPL"); | 1857 | MODULE_LICENSE("GPL"); |
1863 | 1858 | ||
1864 | static struct usb_driver rt2500usb_driver = { | 1859 | static struct usb_driver rt2500usb_driver = { |
1865 | .name = DRV_NAME, | 1860 | .name = KBUILD_MODNAME, |
1866 | .id_table = rt2500usb_device_table, | 1861 | .id_table = rt2500usb_device_table, |
1867 | .probe = rt2x00usb_probe, | 1862 | .probe = rt2x00usb_probe, |
1868 | .disconnect = rt2x00usb_disconnect, | 1863 | .disconnect = rt2x00usb_disconnect, |
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 84b0fc9365f..b2283cebfab 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
@@ -41,7 +41,6 @@ | |||
41 | 41 | ||
42 | /* | 42 | /* |
43 | * Module information. | 43 | * Module information. |
44 | * DRV_NAME should be set within the individual module source files. | ||
45 | */ | 44 | */ |
46 | #define DRV_VERSION "2.0.12" | 45 | #define DRV_VERSION "2.0.12" |
47 | #define DRV_PROJECT "http://rt2x00.serialmonkey.com" | 46 | #define DRV_PROJECT "http://rt2x00.serialmonkey.com" |
@@ -56,7 +55,7 @@ | |||
56 | 55 | ||
57 | #define DEBUG_PRINTK_PROBE(__kernlvl, __lvl, __msg, __args...) \ | 56 | #define DEBUG_PRINTK_PROBE(__kernlvl, __lvl, __msg, __args...) \ |
58 | printk(__kernlvl "%s -> %s: %s - " __msg, \ | 57 | printk(__kernlvl "%s -> %s: %s - " __msg, \ |
59 | DRV_NAME, __FUNCTION__, __lvl, ##__args) | 58 | KBUILD_MODNAME, __FUNCTION__, __lvl, ##__args) |
60 | 59 | ||
61 | #ifdef CONFIG_RT2X00_DEBUG | 60 | #ifdef CONFIG_RT2X00_DEBUG |
62 | #define DEBUG_PRINTK(__dev, __kernlvl, __lvl, __msg, __args...) \ | 61 | #define DEBUG_PRINTK(__dev, __kernlvl, __lvl, __msg, __args...) \ |
diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c index 9f0733bc4fa..72cfe00c1ed 100644 --- a/drivers/net/wireless/rt2x00/rt2x00config.c +++ b/drivers/net/wireless/rt2x00/rt2x00config.c | |||
@@ -23,11 +23,6 @@ | |||
23 | Abstract: rt2x00 generic configuration routines. | 23 | Abstract: rt2x00 generic configuration routines. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | /* | ||
27 | * Set enviroment defines for rt2x00.h | ||
28 | */ | ||
29 | #define DRV_NAME "rt2x00lib" | ||
30 | |||
31 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
32 | #include <linux/module.h> | 27 | #include <linux/module.h> |
33 | 28 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c index 9275d6f9517..6dc9a250356 100644 --- a/drivers/net/wireless/rt2x00/rt2x00debug.c +++ b/drivers/net/wireless/rt2x00/rt2x00debug.c | |||
@@ -23,11 +23,6 @@ | |||
23 | Abstract: rt2x00 debugfs specific routines. | 23 | Abstract: rt2x00 debugfs specific routines. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | /* | ||
27 | * Set enviroment defines for rt2x00.h | ||
28 | */ | ||
29 | #define DRV_NAME "rt2x00lib" | ||
30 | |||
31 | #include <linux/debugfs.h> | 26 | #include <linux/debugfs.h> |
32 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
33 | #include <linux/module.h> | 28 | #include <linux/module.h> |
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 3ab1fb993d6..e8949785c66 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
@@ -23,11 +23,6 @@ | |||
23 | Abstract: rt2x00 generic device routines. | 23 | Abstract: rt2x00 generic device routines. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | /* | ||
27 | * Set enviroment defines for rt2x00.h | ||
28 | */ | ||
29 | #define DRV_NAME "rt2x00lib" | ||
30 | |||
31 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
32 | #include <linux/module.h> | 27 | #include <linux/module.h> |
33 | 28 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2x00firmware.c b/drivers/net/wireless/rt2x00/rt2x00firmware.c index 236025f8b90..0a475e4e244 100644 --- a/drivers/net/wireless/rt2x00/rt2x00firmware.c +++ b/drivers/net/wireless/rt2x00/rt2x00firmware.c | |||
@@ -23,11 +23,6 @@ | |||
23 | Abstract: rt2x00 firmware loading routines. | 23 | Abstract: rt2x00 firmware loading routines. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | /* | ||
27 | * Set enviroment defines for rt2x00.h | ||
28 | */ | ||
29 | #define DRV_NAME "rt2x00lib" | ||
30 | |||
31 | #include <linux/crc-itu-t.h> | 26 | #include <linux/crc-itu-t.h> |
32 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
33 | #include <linux/module.h> | 28 | #include <linux/module.h> |
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 85ea8a8e658..e216c34a51a 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
@@ -23,11 +23,6 @@ | |||
23 | Abstract: rt2x00 generic mac80211 routines. | 23 | Abstract: rt2x00 generic mac80211 routines. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | /* | ||
27 | * Set enviroment defines for rt2x00.h | ||
28 | */ | ||
29 | #define DRV_NAME "rt2x00lib" | ||
30 | |||
31 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
32 | #include <linux/module.h> | 27 | #include <linux/module.h> |
33 | 28 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index 55d0614588b..cf0bb5d9d84 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c | |||
@@ -23,11 +23,6 @@ | |||
23 | Abstract: rt2x00 generic pci device routines. | 23 | Abstract: rt2x00 generic pci device routines. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | /* | ||
27 | * Set enviroment defines for rt2x00.h | ||
28 | */ | ||
29 | #define DRV_NAME "rt2x00pci" | ||
30 | |||
31 | #include <linux/dma-mapping.h> | 26 | #include <linux/dma-mapping.h> |
32 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
33 | #include <linux/module.h> | 28 | #include <linux/module.h> |
diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c index 16d365deefd..bbbf51d8a74 100644 --- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c +++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c | |||
@@ -23,11 +23,6 @@ | |||
23 | Abstract: rt2x00 rfkill routines. | 23 | Abstract: rt2x00 rfkill routines. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | /* | ||
27 | * Set enviroment defines for rt2x00.h | ||
28 | */ | ||
29 | #define DRV_NAME "rt2x00lib" | ||
30 | |||
31 | #include <linux/input-polldev.h> | 26 | #include <linux/input-polldev.h> |
32 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
33 | #include <linux/module.h> | 28 | #include <linux/module.h> |
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index a8f0f80ddd2..9b55f7997ca 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c | |||
@@ -23,11 +23,6 @@ | |||
23 | Abstract: rt2x00 generic usb device routines. | 23 | Abstract: rt2x00 generic usb device routines. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | /* | ||
27 | * Set enviroment defines for rt2x00.h | ||
28 | */ | ||
29 | #define DRV_NAME "rt2x00usb" | ||
30 | |||
31 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
32 | #include <linux/module.h> | 27 | #include <linux/module.h> |
33 | #include <linux/usb.h> | 28 | #include <linux/usb.h> |
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 40e516b70fe..52622d32ea4 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
@@ -24,11 +24,6 @@ | |||
24 | Supported chipsets: RT2561, RT2561s, RT2661. | 24 | Supported chipsets: RT2561, RT2561s, RT2661. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | /* | ||
28 | * Set enviroment defines for rt2x00.h | ||
29 | */ | ||
30 | #define DRV_NAME "rt61pci" | ||
31 | |||
32 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
33 | #include <linux/etherdevice.h> | 28 | #include <linux/etherdevice.h> |
34 | #include <linux/init.h> | 29 | #include <linux/init.h> |
@@ -2497,7 +2492,7 @@ static const struct rt2x00lib_ops rt61pci_rt2x00_ops = { | |||
2497 | }; | 2492 | }; |
2498 | 2493 | ||
2499 | static const struct rt2x00_ops rt61pci_ops = { | 2494 | static const struct rt2x00_ops rt61pci_ops = { |
2500 | .name = DRV_NAME, | 2495 | .name = KBUILD_MODNAME, |
2501 | .rxd_size = RXD_DESC_SIZE, | 2496 | .rxd_size = RXD_DESC_SIZE, |
2502 | .txd_size = TXD_DESC_SIZE, | 2497 | .txd_size = TXD_DESC_SIZE, |
2503 | .eeprom_size = EEPROM_SIZE, | 2498 | .eeprom_size = EEPROM_SIZE, |
@@ -2534,7 +2529,7 @@ MODULE_FIRMWARE(FIRMWARE_RT2661); | |||
2534 | MODULE_LICENSE("GPL"); | 2529 | MODULE_LICENSE("GPL"); |
2535 | 2530 | ||
2536 | static struct pci_driver rt61pci_driver = { | 2531 | static struct pci_driver rt61pci_driver = { |
2537 | .name = DRV_NAME, | 2532 | .name = KBUILD_MODNAME, |
2538 | .id_table = rt61pci_device_table, | 2533 | .id_table = rt61pci_device_table, |
2539 | .probe = rt2x00pci_probe, | 2534 | .probe = rt2x00pci_probe, |
2540 | .remove = __devexit_p(rt2x00pci_remove), | 2535 | .remove = __devexit_p(rt2x00pci_remove), |
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 4d1227aef08..49180de321e 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -24,11 +24,6 @@ | |||
24 | Supported chipsets: rt2571W & rt2671. | 24 | Supported chipsets: rt2571W & rt2671. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | /* | ||
28 | * Set enviroment defines for rt2x00.h | ||
29 | */ | ||
30 | #define DRV_NAME "rt73usb" | ||
31 | |||
32 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
33 | #include <linux/etherdevice.h> | 28 | #include <linux/etherdevice.h> |
34 | #include <linux/init.h> | 29 | #include <linux/init.h> |
@@ -2046,7 +2041,7 @@ static const struct rt2x00lib_ops rt73usb_rt2x00_ops = { | |||
2046 | }; | 2041 | }; |
2047 | 2042 | ||
2048 | static const struct rt2x00_ops rt73usb_ops = { | 2043 | static const struct rt2x00_ops rt73usb_ops = { |
2049 | .name = DRV_NAME, | 2044 | .name = KBUILD_MODNAME, |
2050 | .rxd_size = RXD_DESC_SIZE, | 2045 | .rxd_size = RXD_DESC_SIZE, |
2051 | .txd_size = TXD_DESC_SIZE, | 2046 | .txd_size = TXD_DESC_SIZE, |
2052 | .eeprom_size = EEPROM_SIZE, | 2047 | .eeprom_size = EEPROM_SIZE, |
@@ -2133,7 +2128,7 @@ MODULE_FIRMWARE(FIRMWARE_RT2571); | |||
2133 | MODULE_LICENSE("GPL"); | 2128 | MODULE_LICENSE("GPL"); |
2134 | 2129 | ||
2135 | static struct usb_driver rt73usb_driver = { | 2130 | static struct usb_driver rt73usb_driver = { |
2136 | .name = DRV_NAME, | 2131 | .name = KBUILD_MODNAME, |
2137 | .id_table = rt73usb_device_table, | 2132 | .id_table = rt73usb_device_table, |
2138 | .probe = rt2x00usb_probe, | 2133 | .probe = rt2x00usb_probe, |
2139 | .disconnect = rt2x00usb_disconnect, | 2134 | .disconnect = rt2x00usb_disconnect, |