diff options
| author | Simone Willett <swillett@nvidia.com> | 2011-10-21 18:16:51 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2011-10-21 18:22:45 -0700 |
| commit | f089dd095bc35690896e3f6fb92b8c9e0dbd5b43 (patch) | |
| tree | 228a9436f403373423d3c4e6afcfd4ee2404ca1f | |
| parent | 4a6f0349ddf4529546074f9bce8ee89571fcf049 (diff) | |
Revert "arm: tegra: comms: Allow variable number of RAW-IP interfaces."
This reverts commit 0fbbd5191c3f1bcd873a2f13edeb63050dab33c1.
Change-Id: I4e565a81cf5fda5c5bd682aa94cc23cda00e0339
Reviewed-on: http://git-master/r/59773
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
| -rwxr-xr-x | drivers/net/usb/raw_ip_net.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/usb/raw_ip_net.c b/drivers/net/usb/raw_ip_net.c index ff550a5703f7..08785e020076 100755 --- a/drivers/net/usb/raw_ip_net.c +++ b/drivers/net/usb/raw_ip_net.c @@ -48,15 +48,12 @@ MODULE_LICENSE("GPL"); int g_i; -int max_intfs = MAX_INTFS; unsigned long usb_net_raw_ip_vid = 0x1519; unsigned long usb_net_raw_ip_pid = 0x0020; unsigned long usb_net_raw_ip_intf[MAX_INTFS] = { 0x03, 0x05, 0x07 }; unsigned long usb_net_raw_ip_rx_debug; unsigned long usb_net_raw_ip_tx_debug; -module_param(max_intfs, int, 0644); -MODULE_PARM_DESC(max_intfs, "usb net (raw-ip) - max. interfaces supported"); module_param(usb_net_raw_ip_vid, ulong, 0644); MODULE_PARM_DESC(usb_net_raw_ip_vid, "usb net (raw-ip) - USB VID"); module_param(usb_net_raw_ip_pid, ulong, 0644); @@ -145,7 +142,7 @@ static int baseband_usb_driver_suspend(struct usb_interface *intf, pr_debug("%s intf %p\n", __func__, intf); - for (i = 0; i < max_intfs; i++) { + for (i = 0; i < MAX_INTFS; i++) { pr_debug("[%d]\n", i); if (!baseband_usb_net[i]) continue; @@ -172,7 +169,7 @@ static int baseband_usb_driver_resume(struct usb_interface *intf) pr_debug("%s intf %p\n", __func__, intf); - for (i = 0; i < max_intfs; i++) { + for (i = 0; i < MAX_INTFS; i++) { pr_debug("[%d]\n", i); if (!baseband_usb_net[i]) continue; @@ -627,7 +624,7 @@ static int usb_net_raw_ip_init(void) pr_debug("usb_net_raw_ip_init {\n"); /* create multiple raw-ip network devices */ - for (i = 0; i < max_intfs; i++) { + for (i = 0; i < MAX_INTFS; i++) { /* open baseband usb */ g_i = i; baseband_usb_net[i] = baseband_usb_open(i, usb_net_raw_ip_vid, @@ -670,7 +667,7 @@ static int usb_net_raw_ip_init(void) error_exit: /* destroy multiple raw-ip network devices */ - for (i = 0; i < max_intfs; i++) { + for (i = 0; i < MAX_INTFS; i++) { /* unregister network device */ if (usb_net_raw_ip_dev[i]) { unregister_netdev(usb_net_raw_ip_dev[i]); @@ -694,7 +691,7 @@ static void usb_net_raw_ip_exit(void) pr_debug("usb_net_raw_ip_exit {\n"); /* destroy multiple raw-ip network devices */ - for (i = 0; i < max_intfs; i++) { + for (i = 0; i < MAX_INTFS; i++) { /* unregister network device */ if (usb_net_raw_ip_dev[i]) { unregister_netdev(usb_net_raw_ip_dev[i]); |