Commit 2360157c authored by Ivo van Doorn's avatar Ivo van Doorn Committed by David S. Miller
Browse files

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: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a293ee99
......@@ -24,11 +24,6 @@
Supported chipsets: RT2460.
*/
/*
* Set enviroment defines for rt2x00.h
*/
#define DRV_NAME "rt2400pci"
#include <linux/delay.h>
#include <linux/etherdevice.h>
#include <linux/init.h>
......@@ -1610,7 +1605,7 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = {
};
static const struct rt2x00_ops rt2400pci_ops = {
.name = DRV_NAME,
.name = KBUILD_MODNAME,
.rxd_size = RXD_DESC_SIZE,
.txd_size = TXD_DESC_SIZE,
.eeprom_size = EEPROM_SIZE,
......@@ -1638,7 +1633,7 @@ MODULE_DEVICE_TABLE(pci, rt2400pci_device_table);
MODULE_LICENSE("GPL");
static struct pci_driver rt2400pci_driver = {
.name = DRV_NAME,
.name = KBUILD_MODNAME,
.id_table = rt2400pci_device_table,
.probe = rt2x00pci_probe,
.remove = __devexit_p(rt2x00pci_remove),
......
......@@ -24,11 +24,6 @@
Supported chipsets: RT2560.
*/
/*
* Set enviroment defines for rt2x00.h
*/
#define DRV_NAME "rt2500pci"
#include <linux/delay.h>
#include <linux/etherdevice.h>
#include <linux/init.h>
......@@ -1903,7 +1898,7 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = {
};
static const struct rt2x00_ops rt2500pci_ops = {
.name = DRV_NAME,
.name = KBUILD_MODNAME,
.rxd_size = RXD_DESC_SIZE,
.txd_size = TXD_DESC_SIZE,
.eeprom_size = EEPROM_SIZE,
......@@ -1931,7 +1926,7 @@ MODULE_DEVICE_TABLE(pci, rt2500pci_device_table);
MODULE_LICENSE("GPL");
static struct pci_driver rt2500pci_driver = {
.name = DRV_NAME,
.name = KBUILD_MODNAME,
.id_table = rt2500pci_device_table,
.probe = rt2x00pci_probe,
.remove = __devexit_p(rt2x00pci_remove),
......
......@@ -24,11 +24,6 @@
Supported chipsets: RT2570.
*/
/*
* Set enviroment defines for rt2x00.h
*/
#define DRV_NAME "rt2500usb"
#include <linux/delay.h>
#include <linux/etherdevice.h>
#include <linux/init.h>
......@@ -1790,7 +1785,7 @@ static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = {
};
static const struct rt2x00_ops rt2500usb_ops = {
.name = DRV_NAME,
.name = KBUILD_MODNAME,
.rxd_size = RXD_DESC_SIZE,
.txd_size = TXD_DESC_SIZE,
.eeprom_size = EEPROM_SIZE,
......@@ -1862,7 +1857,7 @@ MODULE_DEVICE_TABLE(usb, rt2500usb_device_table);
MODULE_LICENSE("GPL");
static struct usb_driver rt2500usb_driver = {
.name = DRV_NAME,
.name = KBUILD_MODNAME,
.id_table = rt2500usb_device_table,
.probe = rt2x00usb_probe,
.disconnect = rt2x00usb_disconnect,
......
......@@ -41,7 +41,6 @@
/*
* Module information.
* DRV_NAME should be set within the individual module source files.
*/
#define DRV_VERSION "2.0.12"
#define DRV_PROJECT "http://rt2x00.serialmonkey.com"
......@@ -56,7 +55,7 @@
#define DEBUG_PRINTK_PROBE(__kernlvl, __lvl, __msg, __args...) \
printk(__kernlvl "%s -> %s: %s - " __msg, \
DRV_NAME, __FUNCTION__, __lvl, ##__args)
KBUILD_MODNAME, __FUNCTION__, __lvl, ##__args)
#ifdef CONFIG_RT2X00_DEBUG
#define DEBUG_PRINTK(__dev, __kernlvl, __lvl, __msg, __args...) \
......
......@@ -23,11 +23,6 @@
Abstract: rt2x00 generic configuration routines.
*/
/*
* Set enviroment defines for rt2x00.h
*/
#define DRV_NAME "rt2x00lib"
#include <linux/kernel.h>
#include <linux/module.h>
......
......@@ -23,11 +23,6 @@
Abstract: rt2x00 debugfs specific routines.
*/
/*
* Set enviroment defines for rt2x00.h
*/
#define DRV_NAME "rt2x00lib"
#include <linux/debugfs.h>
#include <linux/kernel.h>
#include <linux/module.h>
......
......@@ -23,11 +23,6 @@
Abstract: rt2x00 generic device routines.
*/
/*
* Set enviroment defines for rt2x00.h
*/
#define DRV_NAME "rt2x00lib"
#include <linux/kernel.h>
#include <linux/module.h>
......
......@@ -23,11 +23,6 @@
Abstract: rt2x00 firmware loading routines.
*/
/*
* Set enviroment defines for rt2x00.h
*/
#define DRV_NAME "rt2x00lib"
#include <linux/crc-itu-t.h>
#include <linux/kernel.h>
#include <linux/module.h>
......
......@@ -23,11 +23,6 @@
Abstract: rt2x00 generic mac80211 routines.
*/
/*
* Set enviroment defines for rt2x00.h
*/
#define DRV_NAME "rt2x00lib"
#include <linux/kernel.h>
#include <linux/module.h>
......
......@@ -23,11 +23,6 @@
Abstract: rt2x00 generic pci device routines.
*/
/*
* Set enviroment defines for rt2x00.h
*/
#define DRV_NAME "rt2x00pci"
#include <linux/dma-mapping.h>
#include <linux/kernel.h>
#include <linux/module.h>
......
......@@ -23,11 +23,6 @@
Abstract: rt2x00 rfkill routines.
*/
/*
* Set enviroment defines for rt2x00.h
*/
#define DRV_NAME "rt2x00lib"
#include <linux/input-polldev.h>
#include <linux/kernel.h>
#include <linux/module.h>
......
......@@ -23,11 +23,6 @@
Abstract: rt2x00 generic usb device routines.
*/
/*
* Set enviroment defines for rt2x00.h
*/
#define DRV_NAME "rt2x00usb"
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/usb.h>
......
......@@ -24,11 +24,6 @@
Supported chipsets: RT2561, RT2561s, RT2661.
*/
/*
* Set enviroment defines for rt2x00.h
*/
#define DRV_NAME "rt61pci"
#include <linux/delay.h>
#include <linux/etherdevice.h>
#include <linux/init.h>
......@@ -2497,7 +2492,7 @@ static const struct rt2x00lib_ops rt61pci_rt2x00_ops = {
};
static const struct rt2x00_ops rt61pci_ops = {
.name = DRV_NAME,
.name = KBUILD_MODNAME,
.rxd_size = RXD_DESC_SIZE,
.txd_size = TXD_DESC_SIZE,
.eeprom_size = EEPROM_SIZE,
......@@ -2534,7 +2529,7 @@ MODULE_FIRMWARE(FIRMWARE_RT2661);
MODULE_LICENSE("GPL");
static struct pci_driver rt61pci_driver = {
.name = DRV_NAME,
.name = KBUILD_MODNAME,
.id_table = rt61pci_device_table,
.probe = rt2x00pci_probe,
.remove = __devexit_p(rt2x00pci_remove),
......
......@@ -24,11 +24,6 @@
Supported chipsets: rt2571W & rt2671.
*/
/*
* Set enviroment defines for rt2x00.h
*/
#define DRV_NAME "rt73usb"
#include <linux/delay.h>
#include <linux/etherdevice.h>
#include <linux/init.h>
......@@ -2046,7 +2041,7 @@ static const struct rt2x00lib_ops rt73usb_rt2x00_ops = {
};
static const struct rt2x00_ops rt73usb_ops = {
.name = DRV_NAME,
.name = KBUILD_MODNAME,
.rxd_size = RXD_DESC_SIZE,
.txd_size = TXD_DESC_SIZE,
.eeprom_size = EEPROM_SIZE,
......@@ -2133,7 +2128,7 @@ MODULE_FIRMWARE(FIRMWARE_RT2571);
MODULE_LICENSE("GPL");
static struct usb_driver rt73usb_driver = {
.name = DRV_NAME,
.name = KBUILD_MODNAME,
.id_table = rt73usb_device_table,
.probe = rt2x00usb_probe,
.disconnect = rt2x00usb_disconnect,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment