diff options
| -rw-r--r-- | sta_dk_4_0_4_32/pform/linux/inc/esta_drv.h | 1 | ||||
| -rw-r--r-- | sta_dk_4_0_4_32/pform/linux/src/esta_drv.c | 13 |
2 files changed, 4 insertions, 10 deletions
diff --git a/sta_dk_4_0_4_32/pform/linux/inc/esta_drv.h b/sta_dk_4_0_4_32/pform/linux/inc/esta_drv.h index 3b5b9a9..8577596 100644 --- a/sta_dk_4_0_4_32/pform/linux/inc/esta_drv.h +++ b/sta_dk_4_0_4_32/pform/linux/inc/esta_drv.h @@ -76,7 +76,6 @@ #define TIWLAN_DRV_NAME "tiwlan" #define TIWLAN_DRV_IF_NAME TIWLAN_DRV_NAME"%d" #define TIWLAN_DRV_NAME_WIRELESS_PROTO "IEEE 802.11-DS" -#define TIWLAN_DBG_PROC "wifidbg" void *wifi_kernel_prealloc(int section, unsigned long size); diff --git a/sta_dk_4_0_4_32/pform/linux/src/esta_drv.c b/sta_dk_4_0_4_32/pform/linux/src/esta_drv.c index a802b35..e3a178c 100644 --- a/sta_dk_4_0_4_32/pform/linux/src/esta_drv.c +++ b/sta_dk_4_0_4_32/pform/linux/src/esta_drv.c @@ -1951,7 +1951,7 @@ static int __init tiwlan_module_init(void) if (packed_struct_tst()) ;/*IT: return -EINVAL; */ - tiwlan_deb_entry = create_proc_entry(TIWLAN_DBG_PROC, 0644, NULL); + tiwlan_deb_entry = create_proc_entry("mem", 0644, NULL); if (tiwlan_deb_entry == NULL) return -EINVAL; tiwlan_deb_entry->read_proc = tiwlan_deb_read_proc; @@ -1962,7 +1962,6 @@ static int __init tiwlan_module_init(void) #ifdef TIWLAN_CARDBUS if ((rc=pci_register_driver(&tnetw1130_pci_driver)) < 0) print_err("TIWLAN: PCMCIA driver failed to register\n"); - remove_proc_entry(TIWLAN_DBG_PROC, NULL); return rc; } printk(KERN_INFO "TIWLAN: Driver loaded\n"); @@ -1987,23 +1986,19 @@ static int __init tiwlan_module_init(void) rc = sdio_register_driver(&tiwlan_sdio_drv); if (rc < 0) { printk(KERN_ERR "sdio register failed (%d)\n", rc); - remove_proc_entry(TIWLAN_DBG_PROC, NULL); return rc; } /* rc = tiwlan_create_drv(0, 0, 0, 0, 0, TROUT_IRQ, NULL, NULL); -- Called in probe */ tiwlan_calibration = create_proc_entry("calibration", 0644, NULL); - if (tiwlan_calibration == NULL) { - remove_proc_entry(TIWLAN_DBG_PROC, NULL); - return -EINVAL; - } + if (tiwlan_calibration == NULL) + return -EINVAL; tiwlan_calibration->size = tiwlan_get_nvs_size(); tiwlan_calibration->read_proc = tiwlan_calibration_read_proc; tiwlan_calibration->write_proc = tiwlan_calibration_write_proc; if (!wait_for_completion_timeout(&sdio_wait, msecs_to_jiffies(10000))) { printk(KERN_ERR "%s: Timed out waiting for device detect\n", __func__); - remove_proc_entry(TIWLAN_DBG_PROC, NULL); remove_proc_entry("calibration", NULL); sdio_unregister_driver(&tiwlan_sdio_drv); #ifdef CONFIG_WIFI_CONTROL_FUNC @@ -2041,7 +2036,7 @@ static void __exit tiwlan_module_cleanup(void) list_del(l); tiwlan_destroy_drv(drv); } - remove_proc_entry(TIWLAN_DBG_PROC, NULL); + remove_proc_entry("mem", NULL); #ifdef TIWLAN_MSM7000 remove_proc_entry("calibration", NULL); sdio_unregister_driver(&tiwlan_sdio_drv); |