remove netdev_name, names of network devices can be set via udevmerge-upstream

1 files changed, 4 insertions, 10 deletions

diff --git a/at76c503.c b/at76c503.c
index 400cd80..fb67552 100644
--- a/at76c503.c
+++ b/at76c503.c
@@ -295,7 +295,6 @@ static int international_roaming = IR_OFF;
 static int default_iw_mode = IW_MODE_INFRA;
 static int monitor_scan_min_time = 50;
 static int monitor_scan_max_time = 600;
-static char* netdev_name = "wlan%d";
 
 /* Function prototypes */
 static void iwspy_update(struct at76c503 *dev, struct at76c503_rx_buffer *buf);
@@ -6325,8 +6324,7 @@ static int at76c503_alloc_urbs(struct at76c503 *dev)
 
 
 static struct at76c503 *alloc_new_device(struct usb_device *udev,
-					 int board_type,
-					 const char *netdev_name)
+					 int board_type)
 {
 	struct net_device *netdev;
 	struct at76c503 *dev = NULL;
@@ -6391,8 +6389,6 @@ static struct at76c503 *alloc_new_device(struct usb_device *udev,
 	dev->pm_mode = pm_mode;
 	dev->pm_period_us = pm_period;
 
-	dev_alloc_name(netdev, netdev_name);
-
 	return dev;
 } /* alloc_new_device */
 
@@ -6577,8 +6573,7 @@ static int at76c503_get_fw_info(u8 *fw_data, int fw_size,
 
 /* == PROC at76c503_do_probe == */
 static int at76c503_do_probe(struct module *mod, struct usb_device *udev,
-			     u8 *fw_data, int fw_size, u32 board_type,
-			     const char *netdev_name)
+			     u8 *fw_data, int fw_size, u32 board_type)
 {
 	struct usb_interface *intf = udev->actconfig->interface[0];
 	int ret;
@@ -6589,7 +6584,7 @@ static int at76c503_do_probe(struct module *mod, struct usb_device *udev,
 
 	usb_get_dev(udev);
 
-	if ((dev=alloc_new_device(udev, (u8)board_type, netdev_name)) == NULL) {
+	if ((dev = alloc_new_device(udev, (u8)board_type)) == NULL) {
 		ret = -ENOMEM;
 		goto error;
 	}
@@ -6741,7 +6736,7 @@ static int at76c50x_probe(struct usb_interface *interface,
 
 	retval = at76c503_do_probe(THIS_MODULE, udev,
 				   fw->data, fw->size,
-				   boardtype, netdev_name);
+				   boardtype);
 	return retval;
 }
 
@@ -6836,7 +6831,6 @@ module_param(monitor_scan_min_time, int, 0400);
 MODULE_PARM_DESC(monitor_scan_min_time, "scan min channel time in MONITOR MODE (default: 50)");
 module_param(monitor_scan_max_time, int, 0400);
 MODULE_PARM_DESC(monitor_scan_max_time, "scan max channel time in MONITOR MODE (default: 600)");
-module_param(netdev_name, charp, 0400);
 
 module_init(mod_init);
 module_exit(mod_exit);