diff options
author | Devendra Naga <devendra.aaru@gmail.com> | 2012-10-27 02:09:59 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 17:54:34 -0400 |
commit | 75254af8908501f9cfc6be878c595da02859a0b5 (patch) | |
tree | a8ce622d23c5b336ba5821183edebcfbc69ba262 /drivers/staging/csr | |
parent | 438d2d1329914da8fdf3a8aedac8ce7e5ffad26d (diff) |
staging: csr: remove func_exit macro
this macro is used for debugging purposes,
it actually defined as
if (unifi_debug >= 5) {
printk("unifi: <= %s\n", __FUNCTION__);
}
which produces too many of those prints if the unifi_debug is >=5.
remove these calls and the macro itself altogether
Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr')
-rw-r--r-- | drivers/staging/csr/csr_wifi_hip_card_sdio.c | 37 | ||||
-rw-r--r-- | drivers/staging/csr/csr_wifi_hip_download.c | 3 | ||||
-rw-r--r-- | drivers/staging/csr/csr_wifi_hip_dump.c | 4 | ||||
-rw-r--r-- | drivers/staging/csr/csr_wifi_hip_send.c | 2 | ||||
-rw-r--r-- | drivers/staging/csr/drv.c | 19 | ||||
-rw-r--r-- | drivers/staging/csr/firmware.c | 5 | ||||
-rw-r--r-- | drivers/staging/csr/io.c | 9 | ||||
-rw-r--r-- | drivers/staging/csr/mlme.c | 1 | ||||
-rw-r--r-- | drivers/staging/csr/monitor.c | 3 | ||||
-rw-r--r-- | drivers/staging/csr/netdev.c | 41 | ||||
-rw-r--r-- | drivers/staging/csr/sdio_mmc.c | 9 | ||||
-rw-r--r-- | drivers/staging/csr/sme_native.c | 10 | ||||
-rw-r--r-- | drivers/staging/csr/sme_sys.c | 2 | ||||
-rw-r--r-- | drivers/staging/csr/sme_wext.c | 23 | ||||
-rw-r--r-- | drivers/staging/csr/unifi_event.c | 4 | ||||
-rw-r--r-- | drivers/staging/csr/unifi_os.h | 7 | ||||
-rw-r--r-- | drivers/staging/csr/unifi_pdu_processing.c | 11 | ||||
-rw-r--r-- | drivers/staging/csr/unifi_sme.c | 10 |
18 files changed, 0 insertions, 200 deletions
diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.c b/drivers/staging/csr/csr_wifi_hip_card_sdio.c index e7819b1189e..f025efd0679 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.c | |||
@@ -146,7 +146,6 @@ card_t* unifi_alloc_card(CsrSdioFunction *sdio, void *ospriv) | |||
146 | } | 146 | } |
147 | } | 147 | } |
148 | #endif | 148 | #endif |
149 | func_exit(); | ||
150 | return card; | 149 | return card; |
151 | } /* unifi_alloc_card() */ | 150 | } /* unifi_alloc_card() */ |
152 | 151 | ||
@@ -196,7 +195,6 @@ CsrResult unifi_init_card(card_t *card, s32 led_mask) | |||
196 | return r; | 195 | return r; |
197 | } | 196 | } |
198 | 197 | ||
199 | func_exit(); | ||
200 | return CSR_RESULT_SUCCESS; | 198 | return CSR_RESULT_SUCCESS; |
201 | } | 199 | } |
202 | 200 | ||
@@ -389,8 +387,6 @@ CsrResult unifi_download(card_t *card, s32 led_mask) | |||
389 | /* Free the firmware file information. */ | 387 | /* Free the firmware file information. */ |
390 | unifi_fw_read_stop(card->ospriv, dlpriv); | 388 | unifi_fw_read_stop(card->ospriv, dlpriv); |
391 | 389 | ||
392 | func_exit(); | ||
393 | |||
394 | return CSR_RESULT_SUCCESS; | 390 | return CSR_RESULT_SUCCESS; |
395 | } /* unifi_download() */ | 391 | } /* unifi_download() */ |
396 | 392 | ||
@@ -474,8 +470,6 @@ static CsrResult unifi_hip_init(card_t *card) | |||
474 | return r; | 470 | return r; |
475 | } | 471 | } |
476 | 472 | ||
477 | func_exit(); | ||
478 | |||
479 | return CSR_RESULT_SUCCESS; | 473 | return CSR_RESULT_SUCCESS; |
480 | } /* unifi_hip_init() */ | 474 | } /* unifi_hip_init() */ |
481 | 475 | ||
@@ -967,7 +961,6 @@ static CsrResult card_hw_init(card_t *card) | |||
967 | */ | 961 | */ |
968 | unifi_read_panic(card); | 962 | unifi_read_panic(card); |
969 | 963 | ||
970 | func_exit(); | ||
971 | return CSR_RESULT_SUCCESS; | 964 | return CSR_RESULT_SUCCESS; |
972 | } /* card_hw_init() */ | 965 | } /* card_hw_init() */ |
973 | 966 | ||
@@ -1094,7 +1087,6 @@ static CsrResult card_wait_for_unifi_to_reset(card_t *card) | |||
1094 | r = CSR_RESULT_FAILURE; | 1087 | r = CSR_RESULT_FAILURE; |
1095 | } | 1088 | } |
1096 | 1089 | ||
1097 | func_exit(); | ||
1098 | return r; | 1090 | return r; |
1099 | } /* card_wait_for_unifi_to_reset() */ | 1091 | } /* card_wait_for_unifi_to_reset() */ |
1100 | 1092 | ||
@@ -1128,7 +1120,6 @@ static CsrResult card_wait_for_unifi_to_disable(card_t *card) | |||
1128 | unifi_error(card->ospriv, | 1120 | unifi_error(card->ospriv, |
1129 | "Function reset method not supported for chip_id=%d\n", | 1121 | "Function reset method not supported for chip_id=%d\n", |
1130 | card->chip_id); | 1122 | card->chip_id); |
1131 | func_exit(); | ||
1132 | return CSR_RESULT_FAILURE; | 1123 | return CSR_RESULT_FAILURE; |
1133 | } | 1124 | } |
1134 | 1125 | ||
@@ -1195,7 +1186,6 @@ static CsrResult card_wait_for_unifi_to_disable(card_t *card) | |||
1195 | r = CSR_RESULT_FAILURE; | 1186 | r = CSR_RESULT_FAILURE; |
1196 | } | 1187 | } |
1197 | 1188 | ||
1198 | func_exit(); | ||
1199 | return r; | 1189 | return r; |
1200 | } /* card_wait_for_unifi_to_reset() */ | 1190 | } /* card_wait_for_unifi_to_reset() */ |
1201 | 1191 | ||
@@ -1319,7 +1309,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr) | |||
1319 | 1309 | ||
1320 | *paddr = (((u32)mbox1 << 16) | mbox0); | 1310 | *paddr = (((u32)mbox1 << 16) | mbox0); |
1321 | 1311 | ||
1322 | func_exit(); | ||
1323 | return CSR_RESULT_SUCCESS; | 1312 | return CSR_RESULT_SUCCESS; |
1324 | } /* card_wait_for_firmware_to_start() */ | 1313 | } /* card_wait_for_firmware_to_start() */ |
1325 | 1314 | ||
@@ -1347,7 +1336,6 @@ CsrResult unifi_capture_panic(card_t *card) | |||
1347 | */ | 1336 | */ |
1348 | if (!card->panic_data_phy_addr || !card->panic_data_mac_addr) | 1337 | if (!card->panic_data_phy_addr || !card->panic_data_mac_addr) |
1349 | { | 1338 | { |
1350 | func_exit(); | ||
1351 | return CSR_RESULT_SUCCESS; | 1339 | return CSR_RESULT_SUCCESS; |
1352 | } | 1340 | } |
1353 | 1341 | ||
@@ -1362,7 +1350,6 @@ CsrResult unifi_capture_panic(card_t *card) | |||
1362 | unifi_info(card->ospriv, "Unable to read panic codes"); | 1350 | unifi_info(card->ospriv, "Unable to read panic codes"); |
1363 | } | 1351 | } |
1364 | 1352 | ||
1365 | func_exit(); | ||
1366 | return CSR_RESULT_SUCCESS; | 1353 | return CSR_RESULT_SUCCESS; |
1367 | } | 1354 | } |
1368 | 1355 | ||
@@ -1562,7 +1549,6 @@ void unifi_read_panic(card_t *card) | |||
1562 | card->last_mac_panic_arg = p_arg; | 1549 | card->last_mac_panic_arg = p_arg; |
1563 | } | 1550 | } |
1564 | 1551 | ||
1565 | func_exit(); | ||
1566 | } | 1552 | } |
1567 | 1553 | ||
1568 | 1554 | ||
@@ -1712,7 +1698,6 @@ static CsrResult card_allocate_memory_resources(card_t *card) | |||
1712 | 1698 | ||
1713 | card->memory_resources_allocated = 1; | 1699 | card->memory_resources_allocated = 1; |
1714 | 1700 | ||
1715 | func_exit(); | ||
1716 | return CSR_RESULT_SUCCESS; | 1701 | return CSR_RESULT_SUCCESS; |
1717 | } /* card_allocate_memory_resources() */ | 1702 | } /* card_allocate_memory_resources() */ |
1718 | 1703 | ||
@@ -1787,7 +1772,6 @@ static void card_free_memory_resources(card_t *card) | |||
1787 | 1772 | ||
1788 | card->memory_resources_allocated = 0; | 1773 | card->memory_resources_allocated = 0; |
1789 | 1774 | ||
1790 | func_exit(); | ||
1791 | } /* card_free_memory_resources() */ | 1775 | } /* card_free_memory_resources() */ |
1792 | 1776 | ||
1793 | 1777 | ||
@@ -1811,7 +1795,6 @@ static void card_init_soft_queues(card_t *card) | |||
1811 | #ifndef CSR_WIFI_HIP_TA_DISABLE | 1795 | #ifndef CSR_WIFI_HIP_TA_DISABLE |
1812 | unifi_ta_sampling_init(card); | 1796 | unifi_ta_sampling_init(card); |
1813 | #endif | 1797 | #endif |
1814 | func_exit(); | ||
1815 | } | 1798 | } |
1816 | 1799 | ||
1817 | 1800 | ||
@@ -1899,7 +1882,6 @@ void unifi_cancel_pending_signals(card_t *card) | |||
1899 | 1882 | ||
1900 | card_init_soft_queues(card); | 1883 | card_init_soft_queues(card); |
1901 | 1884 | ||
1902 | func_exit(); | ||
1903 | } /* unifi_cancel_pending_signals() */ | 1885 | } /* unifi_cancel_pending_signals() */ |
1904 | 1886 | ||
1905 | 1887 | ||
@@ -1938,7 +1920,6 @@ void unifi_free_card(card_t *card) | |||
1938 | 1920 | ||
1939 | kfree(card); | 1921 | kfree(card); |
1940 | 1922 | ||
1941 | func_exit(); | ||
1942 | } /* unifi_free_card() */ | 1923 | } /* unifi_free_card() */ |
1943 | 1924 | ||
1944 | 1925 | ||
@@ -2051,7 +2032,6 @@ static CsrResult card_init_slots(card_t *card) | |||
2051 | 2032 | ||
2052 | card->dynamic_slot_data.packets_interval = UNIFI_PACKETS_INTERVAL; | 2033 | card->dynamic_slot_data.packets_interval = UNIFI_PACKETS_INTERVAL; |
2053 | 2034 | ||
2054 | func_exit(); | ||
2055 | return CSR_RESULT_SUCCESS; | 2035 | return CSR_RESULT_SUCCESS; |
2056 | } /* card_init_slots() */ | 2036 | } /* card_init_slots() */ |
2057 | 2037 | ||
@@ -2143,7 +2123,6 @@ static void CardReassignDynamicReservation(card_t *card) | |||
2143 | } | 2123 | } |
2144 | 2124 | ||
2145 | card->dynamic_slot_data.total_packets_txed = 0; | 2125 | card->dynamic_slot_data.total_packets_txed = 0; |
2146 | func_exit(); | ||
2147 | } | 2126 | } |
2148 | 2127 | ||
2149 | 2128 | ||
@@ -2180,7 +2159,6 @@ static void CardCheckDynamicReservation(card_t *card, unifi_TrafficQueue queue) | |||
2180 | if (q_len <= card->dynamic_slot_data.from_host_reserved_slots[queue]) | 2159 | if (q_len <= card->dynamic_slot_data.from_host_reserved_slots[queue]) |
2181 | { | 2160 | { |
2182 | unifi_trace(card->ospriv, UDBG5, "queue %d q_len %d already has that many reserved slots, exiting\n", queue, q_len); | 2161 | unifi_trace(card->ospriv, UDBG5, "queue %d q_len %d already has that many reserved slots, exiting\n", queue, q_len); |
2183 | func_exit(); | ||
2184 | return; | 2162 | return; |
2185 | } | 2163 | } |
2186 | 2164 | ||
@@ -2278,7 +2256,6 @@ static void CardCheckDynamicReservation(card_t *card, unifi_TrafficQueue queue) | |||
2278 | card->dynamic_slot_data.from_host_max_slots[i]); | 2256 | card->dynamic_slot_data.from_host_max_slots[i]); |
2279 | } | 2257 | } |
2280 | 2258 | ||
2281 | func_exit(); | ||
2282 | } | 2259 | } |
2283 | 2260 | ||
2284 | 2261 | ||
@@ -2306,7 +2283,6 @@ void CardClearFromHostDataSlot(card_t *card, const s16 slot) | |||
2306 | unifi_warning(card->ospriv, | 2283 | unifi_warning(card->ospriv, |
2307 | "Surprise: request to clear an already free FH data slot: %d\n", | 2284 | "Surprise: request to clear an already free FH data slot: %d\n", |
2308 | slot); | 2285 | slot); |
2309 | func_exit(); | ||
2310 | return; | 2286 | return; |
2311 | } | 2287 | } |
2312 | 2288 | ||
@@ -2342,7 +2318,6 @@ void CardClearFromHostDataSlot(card_t *card, const s16 slot) | |||
2342 | 2318 | ||
2343 | unifi_trace(card->ospriv, UDBG4, "CardClearFromHostDataSlot: slot %d recycled %p\n", slot, os_data_ptr); | 2319 | unifi_trace(card->ospriv, UDBG4, "CardClearFromHostDataSlot: slot %d recycled %p\n", slot, os_data_ptr); |
2344 | 2320 | ||
2345 | func_exit(); | ||
2346 | } /* CardClearFromHostDataSlot() */ | 2321 | } /* CardClearFromHostDataSlot() */ |
2347 | 2322 | ||
2348 | 2323 | ||
@@ -2430,7 +2405,6 @@ u16 CardGetFreeFromHostDataSlots(card_t *card) | |||
2430 | } | 2405 | } |
2431 | } | 2406 | } |
2432 | 2407 | ||
2433 | func_exit(); | ||
2434 | return n; | 2408 | return n; |
2435 | } /* CardGetFreeFromHostDataSlots() */ | 2409 | } /* CardGetFreeFromHostDataSlots() */ |
2436 | 2410 | ||
@@ -2490,7 +2464,6 @@ static CsrResult unifi_identify_hw(card_t *card) | |||
2490 | ChipHelper_MarketingName(card->helper), | 2464 | ChipHelper_MarketingName(card->helper), |
2491 | ChipHelper_FriendlyName(card->helper)); | 2465 | ChipHelper_FriendlyName(card->helper)); |
2492 | 2466 | ||
2493 | func_exit(); | ||
2494 | return CSR_RESULT_SUCCESS; | 2467 | return CSR_RESULT_SUCCESS; |
2495 | } /* unifi_identify_hw() */ | 2468 | } /* unifi_identify_hw() */ |
2496 | 2469 | ||
@@ -2572,7 +2545,6 @@ static CsrResult unifi_prepare_hw(card_t *card) | |||
2572 | return r; | 2545 | return r; |
2573 | } | 2546 | } |
2574 | 2547 | ||
2575 | func_exit(); | ||
2576 | return CSR_RESULT_SUCCESS; | 2548 | return CSR_RESULT_SUCCESS; |
2577 | } /* unifi_prepare_hw() */ | 2549 | } /* unifi_prepare_hw() */ |
2578 | 2550 | ||
@@ -2842,7 +2814,6 @@ static CsrResult card_reset_method_io_enable(card_t *card) | |||
2842 | unifi_warning(card->ospriv, "card_reset_method_io_enable failed to reset UniFi\n"); | 2814 | unifi_warning(card->ospriv, "card_reset_method_io_enable failed to reset UniFi\n"); |
2843 | } | 2815 | } |
2844 | 2816 | ||
2845 | func_exit(); | ||
2846 | return r; | 2817 | return r; |
2847 | } /* card_reset_method_io_enable() */ | 2818 | } /* card_reset_method_io_enable() */ |
2848 | 2819 | ||
@@ -2894,7 +2865,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card) | |||
2894 | if (r != CSR_RESULT_SUCCESS) | 2865 | if (r != CSR_RESULT_SUCCESS) |
2895 | { | 2866 | { |
2896 | unifi_error(card->ospriv, "Can't stop processors\n"); | 2867 | unifi_error(card->ospriv, "Can't stop processors\n"); |
2897 | func_exit(); | ||
2898 | return r; | 2868 | return r; |
2899 | } | 2869 | } |
2900 | 2870 | ||
@@ -2930,7 +2900,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card) | |||
2930 | unifi_warning(card->ospriv, "card_reset_method_dbg_reset failed to reset UniFi\n"); | 2900 | unifi_warning(card->ospriv, "card_reset_method_dbg_reset failed to reset UniFi\n"); |
2931 | } | 2901 | } |
2932 | 2902 | ||
2933 | func_exit(); | ||
2934 | return r; | 2903 | return r; |
2935 | } /* card_reset_method_dbg_reset() */ | 2904 | } /* card_reset_method_dbg_reset() */ |
2936 | 2905 | ||
@@ -2976,7 +2945,6 @@ CsrResult unifi_card_hard_reset(card_t *card) | |||
2976 | if (r != CSR_RESULT_SUCCESS) | 2945 | if (r != CSR_RESULT_SUCCESS) |
2977 | { | 2946 | { |
2978 | unifi_error(card->ospriv, "unifi_card_hard_reset failed to identify h/w\n"); | 2947 | unifi_error(card->ospriv, "unifi_card_hard_reset failed to identify h/w\n"); |
2979 | func_exit(); | ||
2980 | return r; | 2948 | return r; |
2981 | } | 2949 | } |
2982 | 2950 | ||
@@ -3006,7 +2974,6 @@ CsrResult unifi_card_hard_reset(card_t *card) | |||
3006 | } | 2974 | } |
3007 | if (r == CSR_RESULT_SUCCESS) | 2975 | if (r == CSR_RESULT_SUCCESS) |
3008 | { | 2976 | { |
3009 | func_exit(); | ||
3010 | return r; | 2977 | return r; |
3011 | } | 2978 | } |
3012 | } | 2979 | } |
@@ -3069,7 +3036,6 @@ CsrResult CardGenInt(card_t *card) | |||
3069 | 3036 | ||
3070 | card->unifi_interrupt_seq++; | 3037 | card->unifi_interrupt_seq++; |
3071 | 3038 | ||
3072 | func_exit(); | ||
3073 | return CSR_RESULT_SUCCESS; | 3039 | return CSR_RESULT_SUCCESS; |
3074 | } /* CardGenInt() */ | 3040 | } /* CardGenInt() */ |
3075 | 3041 | ||
@@ -3414,7 +3380,6 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue | |||
3414 | { | 3380 | { |
3415 | unifi_trace(card->ospriv, UDBG5, "fh data slot %d: %d\n", i, card->from_host_data[i].bd.data_length); | 3381 | unifi_trace(card->ospriv, UDBG5, "fh data slot %d: %d\n", i, card->from_host_data[i].bd.data_length); |
3416 | } | 3382 | } |
3417 | func_exit(); | ||
3418 | return CSR_RESULT_FAILURE; | 3383 | return CSR_RESULT_FAILURE; |
3419 | } | 3384 | } |
3420 | } | 3385 | } |
@@ -3467,8 +3432,6 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue | |||
3467 | } | 3432 | } |
3468 | } | 3433 | } |
3469 | 3434 | ||
3470 | func_exit(); | ||
3471 | |||
3472 | return CSR_RESULT_SUCCESS; | 3435 | return CSR_RESULT_SUCCESS; |
3473 | } /* CardWriteBulkData() */ | 3436 | } /* CardWriteBulkData() */ |
3474 | 3437 | ||
diff --git a/drivers/staging/csr/csr_wifi_hip_download.c b/drivers/staging/csr/csr_wifi_hip_download.c index b97af470f25..4dcb151b897 100644 --- a/drivers/staging/csr/csr_wifi_hip_download.c +++ b/drivers/staging/csr/csr_wifi_hip_download.c | |||
@@ -411,7 +411,6 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl) | |||
411 | if (fwinfo == NULL) | 411 | if (fwinfo == NULL) |
412 | { | 412 | { |
413 | unifi_error(card->ospriv, "Failed to allocate memory for patches\n"); | 413 | unifi_error(card->ospriv, "Failed to allocate memory for patches\n"); |
414 | func_exit(); | ||
415 | return CSR_WIFI_HIP_RESULT_NO_MEMORY; | 414 | return CSR_WIFI_HIP_RESULT_NO_MEMORY; |
416 | } | 415 | } |
417 | 416 | ||
@@ -427,7 +426,6 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl) | |||
427 | { | 426 | { |
428 | kfree(fwinfo); | 427 | kfree(fwinfo); |
429 | unifi_error(card->ospriv, "Failed to read in patch file\n"); | 428 | unifi_error(card->ospriv, "Failed to read in patch file\n"); |
430 | func_exit(); | ||
431 | return CSR_WIFI_HIP_RESULT_INVALID_VALUE; | 429 | return CSR_WIFI_HIP_RESULT_INVALID_VALUE; |
432 | } | 430 | } |
433 | 431 | ||
@@ -442,7 +440,6 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl) | |||
442 | card->build_id, fwinfo->build_id); | 440 | card->build_id, fwinfo->build_id); |
443 | kfree(fwinfo); | 441 | kfree(fwinfo); |
444 | #ifndef CSR_WIFI_IGNORE_PATCH_VERSION_MISMATCH | 442 | #ifndef CSR_WIFI_IGNORE_PATCH_VERSION_MISMATCH |
445 | func_exit(); | ||
446 | return CSR_WIFI_HIP_RESULT_INVALID_VALUE; | 443 | return CSR_WIFI_HIP_RESULT_INVALID_VALUE; |
447 | #else | 444 | #else |
448 | fwinfo = NULL; | 445 | fwinfo = NULL; |
diff --git a/drivers/staging/csr/csr_wifi_hip_dump.c b/drivers/staging/csr/csr_wifi_hip_dump.c index cf33b63b20e..c16715165b7 100644 --- a/drivers/staging/csr/csr_wifi_hip_dump.c +++ b/drivers/staging/csr/csr_wifi_hip_dump.c | |||
@@ -774,7 +774,6 @@ CsrResult unifi_coredump_init(card_t *card, u16 num_dump_buffers) | |||
774 | 774 | ||
775 | done: | 775 | done: |
776 | #endif | 776 | #endif |
777 | func_exit(); | ||
778 | return CSR_RESULT_SUCCESS; | 777 | return CSR_RESULT_SUCCESS; |
779 | 778 | ||
780 | #ifndef UNIFI_DISABLE_COREDUMP | 779 | #ifndef UNIFI_DISABLE_COREDUMP |
@@ -782,7 +781,6 @@ fail: | |||
782 | /* Unwind what we allocated so far */ | 781 | /* Unwind what we allocated so far */ |
783 | unifi_error(ospriv, "Out of memory allocating core dump node %d\n", i); | 782 | unifi_error(ospriv, "Out of memory allocating core dump node %d\n", i); |
784 | unifi_coredump_free(card); | 783 | unifi_coredump_free(card); |
785 | func_exit(); | ||
786 | return CSR_WIFI_HIP_RESULT_NO_MEMORY; | 784 | return CSR_WIFI_HIP_RESULT_NO_MEMORY; |
787 | #endif | 785 | #endif |
788 | } /* unifi_coreump_init() */ | 786 | } /* unifi_coreump_init() */ |
@@ -841,8 +839,6 @@ void unifi_coredump_free(card_t *card) | |||
841 | card->dump_buf = NULL; | 839 | card->dump_buf = NULL; |
842 | card->dump_next_write = NULL; | 840 | card->dump_next_write = NULL; |
843 | card->dump_cur_read = NULL; | 841 | card->dump_cur_read = NULL; |
844 | |||
845 | func_exit(); | ||
846 | } /* unifi_coredump_free() */ | 842 | } /* unifi_coredump_free() */ |
847 | 843 | ||
848 | 844 | ||
diff --git a/drivers/staging/csr/csr_wifi_hip_send.c b/drivers/staging/csr/csr_wifi_hip_send.c index 86aa23cefe3..76429e5e77c 100644 --- a/drivers/staging/csr/csr_wifi_hip_send.c +++ b/drivers/staging/csr/csr_wifi_hip_send.c | |||
@@ -270,8 +270,6 @@ static CsrResult send_signal(card_t *card, const u8 *sigptr, u32 siglen, | |||
270 | } | 270 | } |
271 | } | 271 | } |
272 | 272 | ||
273 | func_exit(); | ||
274 | |||
275 | return CSR_RESULT_SUCCESS; | 273 | return CSR_RESULT_SUCCESS; |
276 | } /* send_signal() */ | 274 | } /* send_signal() */ |
277 | 275 | ||
diff --git a/drivers/staging/csr/drv.c b/drivers/staging/csr/drv.c index b301458142e..a5e5d776747 100644 --- a/drivers/staging/csr/drv.c +++ b/drivers/staging/csr/drv.c | |||
@@ -276,7 +276,6 @@ unifi_open(struct inode *inode, struct file *file) | |||
276 | priv = uf_get_instance(devno); | 276 | priv = uf_get_instance(devno); |
277 | if (priv == NULL) { | 277 | if (priv == NULL) { |
278 | unifi_error(NULL, "unifi_open: No device present\n"); | 278 | unifi_error(NULL, "unifi_open: No device present\n"); |
279 | func_exit(); | ||
280 | return -ENODEV; | 279 | return -ENODEV; |
281 | } | 280 | } |
282 | 281 | ||
@@ -288,7 +287,6 @@ unifi_open(struct inode *inode, struct file *file) | |||
288 | /* Too many clients already using this device */ | 287 | /* Too many clients already using this device */ |
289 | unifi_error(priv, "Too many clients already open\n"); | 288 | unifi_error(priv, "Too many clients already open\n"); |
290 | uf_put_instance(devno); | 289 | uf_put_instance(devno); |
291 | func_exit(); | ||
292 | return -ENOSPC; | 290 | return -ENOSPC; |
293 | } | 291 | } |
294 | unifi_trace(priv, UDBG1, "Client is registered to /dev/unifiudi%d\n", devno); | 292 | unifi_trace(priv, UDBG1, "Client is registered to /dev/unifiudi%d\n", devno); |
@@ -308,7 +306,6 @@ unifi_open(struct inode *inode, struct file *file) | |||
308 | uf_put_instance(devno); | 306 | uf_put_instance(devno); |
309 | 307 | ||
310 | unifi_info(priv, "There is already a configuration client using the character device\n"); | 308 | unifi_info(priv, "There is already a configuration client using the character device\n"); |
311 | func_exit(); | ||
312 | return -EBUSY; | 309 | return -EBUSY; |
313 | } | 310 | } |
314 | #endif /* CSR_SME_USERSPACE */ | 311 | #endif /* CSR_SME_USERSPACE */ |
@@ -329,7 +326,6 @@ unifi_open(struct inode *inode, struct file *file) | |||
329 | uf_put_instance(devno); | 326 | uf_put_instance(devno); |
330 | 327 | ||
331 | unifi_error(priv, "Too many clients already open\n"); | 328 | unifi_error(priv, "Too many clients already open\n"); |
332 | func_exit(); | ||
333 | return -ENOSPC; | 329 | return -ENOSPC; |
334 | } | 330 | } |
335 | 331 | ||
@@ -355,7 +351,6 @@ unifi_open(struct inode *inode, struct file *file) | |||
355 | */ | 351 | */ |
356 | file->private_data = udi_cli; | 352 | file->private_data = udi_cli; |
357 | 353 | ||
358 | func_exit(); | ||
359 | return 0; | 354 | return 0; |
360 | } /* unifi_open() */ | 355 | } /* unifi_open() */ |
361 | 356 | ||
@@ -609,7 +604,6 @@ udi_send_signal_unpacked(unifi_priv_t *priv, unsigned char* data, uint data_len) | |||
609 | unifi_net_data_free(priv, &bulk_data.d[i]); | 604 | unifi_net_data_free(priv, &bulk_data.d[i]); |
610 | } | 605 | } |
611 | } | 606 | } |
612 | func_exit(); | ||
613 | return -EIO; | 607 | return -EIO; |
614 | } | 608 | } |
615 | 609 | ||
@@ -660,7 +654,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen) | |||
660 | if ((signal_size <= 0) || (signal_size > buflen)) { | 654 | if ((signal_size <= 0) || (signal_size > buflen)) { |
661 | unifi_error(priv, "udi_send_signal_raw - Couldn't find length of signal 0x%x\n", | 655 | unifi_error(priv, "udi_send_signal_raw - Couldn't find length of signal 0x%x\n", |
662 | sig_id); | 656 | sig_id); |
663 | func_exit(); | ||
664 | return -EINVAL; | 657 | return -EINVAL; |
665 | } | 658 | } |
666 | unifi_trace(priv, UDBG2, "udi_send_signal_raw: signal 0x%.4X len:%d\n", | 659 | unifi_trace(priv, UDBG2, "udi_send_signal_raw: signal 0x%.4X len:%d\n", |
@@ -705,7 +698,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen) | |||
705 | 698 | ||
706 | if (bytecount > buflen) { | 699 | if (bytecount > buflen) { |
707 | unifi_error(priv, "udi_send_signal_raw: Not enough data (%d instead of %d)\n", buflen, bytecount); | 700 | unifi_error(priv, "udi_send_signal_raw: Not enough data (%d instead of %d)\n", buflen, bytecount); |
708 | func_exit(); | ||
709 | return -EINVAL; | 701 | return -EINVAL; |
710 | } | 702 | } |
711 | 703 | ||
@@ -713,7 +705,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen) | |||
713 | r = ul_send_signal_raw(priv, buf, signal_size, &data_ptrs); | 705 | r = ul_send_signal_raw(priv, buf, signal_size, &data_ptrs); |
714 | if (r < 0) { | 706 | if (r < 0) { |
715 | unifi_error(priv, "udi_send_signal_raw: send failed (%d)\n", r); | 707 | unifi_error(priv, "udi_send_signal_raw: send failed (%d)\n", r); |
716 | func_exit(); | ||
717 | return -EIO; | 708 | return -EIO; |
718 | } | 709 | } |
719 | 710 | ||
@@ -802,7 +793,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff) | |||
802 | csrResult = unifi_net_data_malloc(priv, &bulkdata.d[0], len); | 793 | csrResult = unifi_net_data_malloc(priv, &bulkdata.d[0], len); |
803 | if (csrResult != CSR_RESULT_SUCCESS) { | 794 | if (csrResult != CSR_RESULT_SUCCESS) { |
804 | unifi_error(priv, "unifi_write: failed to allocate request_data.\n"); | 795 | unifi_error(priv, "unifi_write: failed to allocate request_data.\n"); |
805 | func_exit(); | ||
806 | return -ENOMEM; | 796 | return -ENOMEM; |
807 | } | 797 | } |
808 | 798 | ||
@@ -812,7 +802,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff) | |||
812 | if (copy_from_user((void*)user_data_buf, p, len)) { | 802 | if (copy_from_user((void*)user_data_buf, p, len)) { |
813 | unifi_error(priv, "unifi_write: copy from user failed\n"); | 803 | unifi_error(priv, "unifi_write: copy from user failed\n"); |
814 | unifi_net_data_free(priv, &bulkdata.d[0]); | 804 | unifi_net_data_free(priv, &bulkdata.d[0]); |
815 | func_exit(); | ||
816 | return -EFAULT; | 805 | return -EFAULT; |
817 | } | 806 | } |
818 | 807 | ||
@@ -828,7 +817,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff) | |||
828 | unifi_error(priv, "unifi_write - Couldn't find length of signal 0x%x\n", | 817 | unifi_error(priv, "unifi_write - Couldn't find length of signal 0x%x\n", |
829 | sig_id); | 818 | sig_id); |
830 | unifi_net_data_free(priv, &bulkdata.d[0]); | 819 | unifi_net_data_free(priv, &bulkdata.d[0]); |
831 | func_exit(); | ||
832 | return -EINVAL; | 820 | return -EINVAL; |
833 | } | 821 | } |
834 | 822 | ||
@@ -839,7 +827,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff) | |||
839 | signal_buf = kmalloc(signal_size, GFP_KERNEL); | 827 | signal_buf = kmalloc(signal_size, GFP_KERNEL); |
840 | if (!signal_buf) { | 828 | if (!signal_buf) { |
841 | unifi_net_data_free(priv, &bulkdata.d[0]); | 829 | unifi_net_data_free(priv, &bulkdata.d[0]); |
842 | func_exit(); | ||
843 | return -ENOMEM; | 830 | return -ENOMEM; |
844 | } | 831 | } |
845 | 832 | ||
@@ -1655,8 +1642,6 @@ unifi_poll(struct file *filp, poll_table *wait) | |||
1655 | mask |= POLLIN | POLLRDNORM; /* readable */ | 1642 | mask |= POLLIN | POLLRDNORM; /* readable */ |
1656 | } | 1643 | } |
1657 | 1644 | ||
1658 | func_exit(); | ||
1659 | |||
1660 | return mask; | 1645 | return mask; |
1661 | } /* unifi_poll() */ | 1646 | } /* unifi_poll() */ |
1662 | 1647 | ||
@@ -1887,7 +1872,6 @@ udi_log_event(ul_client_t *pcli, | |||
1887 | if (down_interruptible(&pcli->udi_sem)) { | 1872 | if (down_interruptible(&pcli->udi_sem)) { |
1888 | printk(KERN_WARNING "udi_log_event_q: Failed to get udi sem\n"); | 1873 | printk(KERN_WARNING "udi_log_event_q: Failed to get udi sem\n"); |
1889 | kfree(logptr); | 1874 | kfree(logptr); |
1890 | func_exit(); | ||
1891 | return; | 1875 | return; |
1892 | } | 1876 | } |
1893 | list_add_tail(&logptr->q, &pcli->udi_log); | 1877 | list_add_tail(&logptr->q, &pcli->udi_log); |
@@ -1896,7 +1880,6 @@ udi_log_event(ul_client_t *pcli, | |||
1896 | /* Wake any waiting user process */ | 1880 | /* Wake any waiting user process */ |
1897 | wake_up_interruptible(&pcli->udi_wq); | 1881 | wake_up_interruptible(&pcli->udi_wq); |
1898 | 1882 | ||
1899 | func_exit(); | ||
1900 | } /* udi_log_event() */ | 1883 | } /* udi_log_event() */ |
1901 | 1884 | ||
1902 | #ifdef CSR_SME_USERSPACE | 1885 | #ifdef CSR_SME_USERSPACE |
@@ -1952,8 +1935,6 @@ uf_sme_queue_message(unifi_priv_t *priv, u8 *buffer, int length) | |||
1952 | /* It is our responsibility to free the buffer allocated in build_packed_*() */ | 1935 | /* It is our responsibility to free the buffer allocated in build_packed_*() */ |
1953 | kfree(buffer); | 1936 | kfree(buffer); |
1954 | 1937 | ||
1955 | func_exit(); | ||
1956 | |||
1957 | return 0; | 1938 | return 0; |
1958 | 1939 | ||
1959 | } /* uf_sme_queue_message() */ | 1940 | } /* uf_sme_queue_message() */ |
diff --git a/drivers/staging/csr/firmware.c b/drivers/staging/csr/firmware.c index 881acc90e53..1d1c10392ad 100644 --- a/drivers/staging/csr/firmware.c +++ b/drivers/staging/csr/firmware.c | |||
@@ -70,7 +70,6 @@ unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info) | |||
70 | } | 70 | } |
71 | /* Set up callback struct for readfunc() */ | 71 | /* Set up callback struct for readfunc() */ |
72 | if (priv->fw_sta.dl_data != NULL) { | 72 | if (priv->fw_sta.dl_data != NULL) { |
73 | func_exit(); | ||
74 | return &priv->fw_sta; | 73 | return &priv->fw_sta; |
75 | } | 74 | } |
76 | 75 | ||
@@ -78,7 +77,6 @@ unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info) | |||
78 | unifi_error(priv, "downloading firmware... unknown request: %d\n", is_fw); | 77 | unifi_error(priv, "downloading firmware... unknown request: %d\n", is_fw); |
79 | } | 78 | } |
80 | 79 | ||
81 | func_exit(); | ||
82 | return NULL; | 80 | return NULL; |
83 | } /* unifi_fw_read_start() */ | 81 | } /* unifi_fw_read_start() */ |
84 | 82 | ||
@@ -112,7 +110,6 @@ unifi_fw_read_stop(void *ospriv, void *dlpriv) | |||
112 | uf_release_firmware(priv, dl_struct); | 110 | uf_release_firmware(priv, dl_struct); |
113 | } | 111 | } |
114 | 112 | ||
115 | func_exit(); | ||
116 | } /* unifi_fw_read_stop() */ | 113 | } /* unifi_fw_read_stop() */ |
117 | 114 | ||
118 | 115 | ||
@@ -142,14 +139,12 @@ unifi_fw_open_buffer(void *ospriv, void *fwbuf, u32 len) | |||
142 | unifi_priv_t *priv = (unifi_priv_t*)ospriv; | 139 | unifi_priv_t *priv = (unifi_priv_t*)ospriv; |
143 | 140 | ||
144 | if (fwbuf == NULL) { | 141 | if (fwbuf == NULL) { |
145 | func_exit(); | ||
146 | return NULL; | 142 | return NULL; |
147 | } | 143 | } |
148 | priv->fw_conv.dl_data = fwbuf; | 144 | priv->fw_conv.dl_data = fwbuf; |
149 | priv->fw_conv.dl_len = len; | 145 | priv->fw_conv.dl_len = len; |
150 | priv->fw_conv.fw_desc = NULL; /* No OS f/w resource is associated */ | 146 | priv->fw_conv.fw_desc = NULL; /* No OS f/w resource is associated */ |
151 | 147 | ||
152 | func_exit(); | ||
153 | return &priv->fw_conv; | 148 | return &priv->fw_conv; |
154 | } | 149 | } |
155 | 150 | ||
diff --git a/drivers/staging/csr/io.c b/drivers/staging/csr/io.c index 95d05264874..0f40b00ad4d 100644 --- a/drivers/staging/csr/io.c +++ b/drivers/staging/csr/io.c | |||
@@ -104,11 +104,9 @@ static CsrResult signal_buffer_init(unifi_priv_t * priv, int size) | |||
104 | kfree(priv->rxSignalBuffer.rx_buff[j].bufptr); | 104 | kfree(priv->rxSignalBuffer.rx_buff[j].bufptr); |
105 | priv->rxSignalBuffer.rx_buff[j].bufptr = NULL; | 105 | priv->rxSignalBuffer.rx_buff[j].bufptr = NULL; |
106 | } | 106 | } |
107 | func_exit(); | ||
108 | return -1; | 107 | return -1; |
109 | } | 108 | } |
110 | } | 109 | } |
111 | func_exit(); | ||
112 | return 0; | 110 | return 0; |
113 | } | 111 | } |
114 | 112 | ||
@@ -411,7 +409,6 @@ register_unifi_sdio(CsrSdioFunction *sdio_dev, int bus_id, struct device *dev) | |||
411 | 409 | ||
412 | up(&Unifi_instance_mutex); | 410 | up(&Unifi_instance_mutex); |
413 | 411 | ||
414 | func_exit(); | ||
415 | return priv; | 412 | return priv; |
416 | 413 | ||
417 | failed4: | 414 | failed4: |
@@ -445,7 +442,6 @@ failed0: | |||
445 | 442 | ||
446 | up(&Unifi_instance_mutex); | 443 | up(&Unifi_instance_mutex); |
447 | 444 | ||
448 | func_exit(); | ||
449 | return NULL; | 445 | return NULL; |
450 | } /* register_unifi_sdio() */ | 446 | } /* register_unifi_sdio() */ |
451 | 447 | ||
@@ -481,8 +477,6 @@ ask_unifi_sdio_cleanup(unifi_priv_t *priv) | |||
481 | unifi_trace(NULL, UDBG5, "ask_unifi_sdio_cleanup: wake up cleanup workqueue.\n"); | 477 | unifi_trace(NULL, UDBG5, "ask_unifi_sdio_cleanup: wake up cleanup workqueue.\n"); |
482 | wake_up(&Unifi_cleanup_wq); | 478 | wake_up(&Unifi_cleanup_wq); |
483 | 479 | ||
484 | func_exit(); | ||
485 | |||
486 | } /* ask_unifi_sdio_cleanup() */ | 480 | } /* ask_unifi_sdio_cleanup() */ |
487 | 481 | ||
488 | 482 | ||
@@ -597,8 +591,6 @@ cleanup_unifi_sdio(unifi_priv_t *priv) | |||
597 | 591 | ||
598 | unifi_trace(NULL, UDBG5, "cleanup_unifi_sdio: DONE.\n"); | 592 | unifi_trace(NULL, UDBG5, "cleanup_unifi_sdio: DONE.\n"); |
599 | 593 | ||
600 | func_exit(); | ||
601 | |||
602 | } /* cleanup_unifi_sdio() */ | 594 | } /* cleanup_unifi_sdio() */ |
603 | 595 | ||
604 | 596 | ||
@@ -632,7 +624,6 @@ unregister_unifi_sdio(int bus_id) | |||
632 | if (priv == NULL) { | 624 | if (priv == NULL) { |
633 | unifi_error(priv, "unregister_unifi_sdio: device %d is not registered\n", | 625 | unifi_error(priv, "unregister_unifi_sdio: device %d is not registered\n", |
634 | bus_id); | 626 | bus_id); |
635 | func_exit(); | ||
636 | return; | 627 | return; |
637 | } | 628 | } |
638 | 629 | ||
diff --git a/drivers/staging/csr/mlme.c b/drivers/staging/csr/mlme.c index 723ecb37859..861d6b7687c 100644 --- a/drivers/staging/csr/mlme.c +++ b/drivers/staging/csr/mlme.c | |||
@@ -197,7 +197,6 @@ unifi_mlme_blocking_request(unifi_priv_t *priv, ul_client_t *pcli, | |||
197 | return r; | 197 | return r; |
198 | } | 198 | } |
199 | 199 | ||
200 | func_exit(); | ||
201 | return 0; | 200 | return 0; |
202 | } /* unifi_mlme_blocking_request() */ | 201 | } /* unifi_mlme_blocking_request() */ |
203 | 202 | ||
diff --git a/drivers/staging/csr/monitor.c b/drivers/staging/csr/monitor.c index 60d52f9e8c3..c8e20e4c611 100644 --- a/drivers/staging/csr/monitor.c +++ b/drivers/staging/csr/monitor.c | |||
@@ -202,7 +202,6 @@ netrx_radiotap(unifi_priv_t *priv, | |||
202 | priv->stats.rx_packets++; | 202 | priv->stats.rx_packets++; |
203 | priv->stats.rx_bytes += ind_data_len; | 203 | priv->stats.rx_bytes += ind_data_len; |
204 | 204 | ||
205 | func_exit(); | ||
206 | } /* netrx_radiotap() */ | 205 | } /* netrx_radiotap() */ |
207 | #endif /* RADIOTAP */ | 206 | #endif /* RADIOTAP */ |
208 | 207 | ||
@@ -314,7 +313,6 @@ netrx_prism(unifi_priv_t *priv, | |||
314 | priv->stats.rx_packets++; | 313 | priv->stats.rx_packets++; |
315 | priv->stats.rx_bytes += ind_data_len; | 314 | priv->stats.rx_bytes += ind_data_len; |
316 | 315 | ||
317 | func_exit(); | ||
318 | } /* netrx_prism() */ | 316 | } /* netrx_prism() */ |
319 | #endif /* PRISM */ | 317 | #endif /* PRISM */ |
320 | 318 | ||
@@ -348,7 +346,6 @@ ma_sniffdata_ind(void *ospriv, | |||
348 | 346 | ||
349 | if (bulkdata->d[0].data_length == 0) { | 347 | if (bulkdata->d[0].data_length == 0) { |
350 | unifi_warning(priv, "rx: MA-SNIFFDATA indication with zero bulk data\n"); | 348 | unifi_warning(priv, "rx: MA-SNIFFDATA indication with zero bulk data\n"); |
351 | func_exit(); | ||
352 | return; | 349 | return; |
353 | } | 350 | } |
354 | 351 | ||
diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c index ca9cc31f116..2d4a4e62221 100644 --- a/drivers/staging/csr/netdev.c +++ b/drivers/staging/csr/netdev.c | |||
@@ -551,7 +551,6 @@ uf_free_netdevice(unifi_priv_t *priv) | |||
551 | } | 551 | } |
552 | } | 552 | } |
553 | 553 | ||
554 | func_exit(); | ||
555 | return 0; | 554 | return 0; |
556 | } /* uf_free_netdevice() */ | 555 | } /* uf_free_netdevice() */ |
557 | 556 | ||
@@ -610,7 +609,6 @@ uf_net_open(struct net_device *dev) | |||
610 | 609 | ||
611 | netif_tx_start_all_queues(dev); | 610 | netif_tx_start_all_queues(dev); |
612 | 611 | ||
613 | func_exit(); | ||
614 | return 0; | 612 | return 0; |
615 | } /* uf_net_open() */ | 613 | } /* uf_net_open() */ |
616 | 614 | ||
@@ -636,7 +634,6 @@ uf_net_stop(struct net_device *dev) | |||
636 | 634 | ||
637 | netif_tx_stop_all_queues(dev); | 635 | netif_tx_stop_all_queues(dev); |
638 | 636 | ||
639 | func_exit(); | ||
640 | return 0; | 637 | return 0; |
641 | } /* uf_net_stop() */ | 638 | } /* uf_net_stop() */ |
642 | 639 | ||
@@ -711,7 +708,6 @@ static CSR_PRIORITY uf_get_packet_priority(unifi_priv_t *priv, netInterface_priv | |||
711 | 708 | ||
712 | unifi_trace(priv, UDBG5, "Packet priority = %d\n", priority); | 709 | unifi_trace(priv, UDBG5, "Packet priority = %d\n", priority); |
713 | 710 | ||
714 | func_exit(); | ||
715 | return priority; | 711 | return priority; |
716 | } | 712 | } |
717 | 713 | ||
@@ -776,7 +772,6 @@ get_packet_priority(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr | |||
776 | } | 772 | } |
777 | unifi_trace(priv, UDBG5, "priority = %x\n", priority); | 773 | unifi_trace(priv, UDBG5, "priority = %x\n", priority); |
778 | 774 | ||
779 | func_exit(); | ||
780 | return priority; | 775 | return priority; |
781 | } | 776 | } |
782 | 777 | ||
@@ -822,7 +817,6 @@ uf_net_select_queue(struct net_device *dev, struct sk_buff *skb) | |||
822 | } | 817 | } |
823 | 818 | ||
824 | 819 | ||
825 | func_exit(); | ||
826 | return (u16)queue; | 820 | return (u16)queue; |
827 | } /* uf_net_select_queue() */ | 821 | } /* uf_net_select_queue() */ |
828 | 822 | ||
@@ -1789,7 +1783,6 @@ uf_net_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1789 | interfacePriv->stats.tx_dropped++; | 1783 | interfacePriv->stats.tx_dropped++; |
1790 | kfree_skb(skb); | 1784 | kfree_skb(skb); |
1791 | 1785 | ||
1792 | func_exit(); | ||
1793 | return NETDEV_TX_OK; | 1786 | return NETDEV_TX_OK; |
1794 | } | 1787 | } |
1795 | 1788 | ||
@@ -1832,7 +1825,6 @@ uf_net_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1832 | 1825 | ||
1833 | /* The skb will have been freed by send_XXX_request() */ | 1826 | /* The skb will have been freed by send_XXX_request() */ |
1834 | 1827 | ||
1835 | func_exit(); | ||
1836 | return result; | 1828 | return result; |
1837 | } /* uf_net_xmit() */ | 1829 | } /* uf_net_xmit() */ |
1838 | 1830 | ||
@@ -1880,7 +1872,6 @@ unifi_pause_xmit(void *ospriv, unifi_TrafficQueue queue) | |||
1880 | unifi_error(priv, "Start buffering %d defaulting to 0\n", queue); | 1872 | unifi_error(priv, "Start buffering %d defaulting to 0\n", queue); |
1881 | } | 1873 | } |
1882 | #endif | 1874 | #endif |
1883 | func_exit(); | ||
1884 | 1875 | ||
1885 | } /* unifi_pause_xmit() */ | 1876 | } /* unifi_pause_xmit() */ |
1886 | 1877 | ||
@@ -1909,7 +1900,6 @@ unifi_restart_xmit(void *ospriv, unifi_TrafficQueue queue) | |||
1909 | uf_send_buffered_frames(priv,0); | 1900 | uf_send_buffered_frames(priv,0); |
1910 | } | 1901 | } |
1911 | #endif | 1902 | #endif |
1912 | func_exit(); | ||
1913 | } /* unifi_restart_xmit() */ | 1903 | } /* unifi_restart_xmit() */ |
1914 | 1904 | ||
1915 | 1905 | ||
@@ -1945,7 +1935,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b | |||
1945 | priv->interfacePriv[ifTag]->stats.rx_frame_errors++; | 1935 | priv->interfacePriv[ifTag]->stats.rx_frame_errors++; |
1946 | unifi_net_data_free(priv, &bulkdata->d[0]); | 1936 | unifi_net_data_free(priv, &bulkdata->d[0]); |
1947 | unifi_notice(priv, "indicate_rx_skb: Discard unknown frame.\n"); | 1937 | unifi_notice(priv, "indicate_rx_skb: Discard unknown frame.\n"); |
1948 | func_exit(); | ||
1949 | return; | 1938 | return; |
1950 | } | 1939 | } |
1951 | 1940 | ||
@@ -1957,7 +1946,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b | |||
1957 | unifi_net_data_free(priv, &bulkdata->d[0]); | 1946 | unifi_net_data_free(priv, &bulkdata->d[0]); |
1958 | unifi_trace(priv, UDBG5, "indicate_rx_skb: Data given to subscription" | 1947 | unifi_trace(priv, UDBG5, "indicate_rx_skb: Data given to subscription" |
1959 | "API, not being given to kernel\n"); | 1948 | "API, not being given to kernel\n"); |
1960 | func_exit(); | ||
1961 | return; | 1949 | return; |
1962 | } | 1950 | } |
1963 | 1951 | ||
@@ -1980,7 +1968,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b | |||
1980 | priv->interfacePriv[ifTag]->stats.rx_errors++; | 1968 | priv->interfacePriv[ifTag]->stats.rx_errors++; |
1981 | priv->interfacePriv[ifTag]->stats.rx_length_errors++; | 1969 | priv->interfacePriv[ifTag]->stats.rx_length_errors++; |
1982 | unifi_net_data_free(priv, &bulkdata->d[0]); | 1970 | unifi_net_data_free(priv, &bulkdata->d[0]); |
1983 | func_exit(); | ||
1984 | return; | 1971 | return; |
1985 | } | 1972 | } |
1986 | 1973 | ||
@@ -2007,7 +1994,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b | |||
2007 | priv->interfacePriv[ifTag]->stats.rx_packets++; | 1994 | priv->interfacePriv[ifTag]->stats.rx_packets++; |
2008 | priv->interfacePriv[ifTag]->stats.rx_bytes += bulkdata->d[0].data_length; | 1995 | priv->interfacePriv[ifTag]->stats.rx_bytes += bulkdata->d[0].data_length; |
2009 | 1996 | ||
2010 | func_exit(); | ||
2011 | return; | 1997 | return; |
2012 | } | 1998 | } |
2013 | 1999 | ||
@@ -2168,7 +2154,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) | |||
2168 | { | 2154 | { |
2169 | unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); | 2155 | unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); |
2170 | unifi_net_data_free(priv,&bulkdata->d[0]); | 2156 | unifi_net_data_free(priv,&bulkdata->d[0]); |
2171 | func_exit(); | ||
2172 | return; | 2157 | return; |
2173 | } | 2158 | } |
2174 | 2159 | ||
@@ -2177,14 +2162,12 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) | |||
2177 | { | 2162 | { |
2178 | unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __FUNCTION__, interfaceTag); | 2163 | unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __FUNCTION__, interfaceTag); |
2179 | unifi_net_data_free(priv, &bulkdata->d[0]); | 2164 | unifi_net_data_free(priv, &bulkdata->d[0]); |
2180 | func_exit(); | ||
2181 | return; | 2165 | return; |
2182 | } | 2166 | } |
2183 | 2167 | ||
2184 | if (bulkdata->d[0].data_length == 0) { | 2168 | if (bulkdata->d[0].data_length == 0) { |
2185 | unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __FUNCTION__); | 2169 | unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __FUNCTION__); |
2186 | unifi_net_data_free(priv,&bulkdata->d[0]); | 2170 | unifi_net_data_free(priv,&bulkdata->d[0]); |
2187 | func_exit(); | ||
2188 | return; | 2171 | return; |
2189 | } | 2172 | } |
2190 | 2173 | ||
@@ -2306,7 +2289,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) | |||
2306 | sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]); | 2289 | sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]); |
2307 | CsrWifiRouterCtrlUnexpectedFrameIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,interfaceTag,peerMacAddress); | 2290 | CsrWifiRouterCtrlUnexpectedFrameIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,interfaceTag,peerMacAddress); |
2308 | unifi_net_data_free(priv, &bulkdata->d[0]); | 2291 | unifi_net_data_free(priv, &bulkdata->d[0]); |
2309 | func_exit(); | ||
2310 | return; | 2292 | return; |
2311 | } | 2293 | } |
2312 | 2294 | ||
@@ -2323,7 +2305,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) | |||
2323 | unifi_net_data_free(priv, &bulkdata->d[0]); | 2305 | unifi_net_data_free(priv, &bulkdata->d[0]); |
2324 | unifi_notice(priv, "%s: Dropping packet, proto=0x%04x, %s port\n", __FUNCTION__, | 2306 | unifi_notice(priv, "%s: Dropping packet, proto=0x%04x, %s port\n", __FUNCTION__, |
2325 | proto, queue ? "Controlled" : "Un-controlled"); | 2307 | proto, queue ? "Controlled" : "Un-controlled"); |
2326 | func_exit(); | ||
2327 | return; | 2308 | return; |
2328 | } | 2309 | } |
2329 | 2310 | ||
@@ -2331,7 +2312,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) | |||
2331 | if((dataFrameType == QOS_DATA_NULL) || (dataFrameType == DATA_NULL)){ | 2312 | if((dataFrameType == QOS_DATA_NULL) || (dataFrameType == DATA_NULL)){ |
2332 | unifi_trace(priv, UDBG5, "%s: Null Frame Received and Freed\n", __FUNCTION__); | 2313 | unifi_trace(priv, UDBG5, "%s: Null Frame Received and Freed\n", __FUNCTION__); |
2333 | unifi_net_data_free(priv, &bulkdata->d[0]); | 2314 | unifi_net_data_free(priv, &bulkdata->d[0]); |
2334 | func_exit(); | ||
2335 | return; | 2315 | return; |
2336 | } | 2316 | } |
2337 | 2317 | ||
@@ -2346,7 +2326,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) | |||
2346 | bulkdata, | 2326 | bulkdata, |
2347 | macHeaderLengthInBytes))) | 2327 | macHeaderLengthInBytes))) |
2348 | { | 2328 | { |
2349 | func_exit(); | ||
2350 | return; | 2329 | return; |
2351 | } | 2330 | } |
2352 | unifi_trace(priv, UDBG5, "unifi_rx: no specific AP handling process as normal frame, MAC Header len %d\n",macHeaderLengthInBytes); | 2331 | unifi_trace(priv, UDBG5, "unifi_rx: no specific AP handling process as normal frame, MAC Header len %d\n",macHeaderLengthInBytes); |
@@ -2369,7 +2348,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) | |||
2369 | unifi_trace(priv, UDBG1, "Zero length frame, but not null-data %04x\n", frameControl); | 2348 | unifi_trace(priv, UDBG1, "Zero length frame, but not null-data %04x\n", frameControl); |
2370 | } | 2349 | } |
2371 | unifi_net_data_free(priv, &bulkdata->d[0]); | 2350 | unifi_net_data_free(priv, &bulkdata->d[0]); |
2372 | func_exit(); | ||
2373 | return; | 2351 | return; |
2374 | } | 2352 | } |
2375 | 2353 | ||
@@ -2379,7 +2357,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) | |||
2379 | unifi_net_data_free(priv, &bulkdata->d[0]); | 2357 | unifi_net_data_free(priv, &bulkdata->d[0]); |
2380 | unifi_notice(priv, "%s: Dropping packet, proto=0x%04x, %s port\n", | 2358 | unifi_notice(priv, "%s: Dropping packet, proto=0x%04x, %s port\n", |
2381 | __FUNCTION__, proto, queue ? "controlled" : "uncontrolled"); | 2359 | __FUNCTION__, proto, queue ? "controlled" : "uncontrolled"); |
2382 | func_exit(); | ||
2383 | return; | 2360 | return; |
2384 | } else if ( (port_action == CSR_WIFI_ROUTER_CTRL_PORT_ACTION_8021X_PORT_CLOSED_BLOCK) || | 2361 | } else if ( (port_action == CSR_WIFI_ROUTER_CTRL_PORT_ACTION_8021X_PORT_CLOSED_BLOCK) || |
2385 | (interfacePriv->connected != UnifiConnected) ) { | 2362 | (interfacePriv->connected != UnifiConnected) ) { |
@@ -2395,7 +2372,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) | |||
2395 | __FUNCTION__, sizeof(rx_buffered_packets_t)); | 2372 | __FUNCTION__, sizeof(rx_buffered_packets_t)); |
2396 | interfacePriv->stats.rx_dropped++; | 2373 | interfacePriv->stats.rx_dropped++; |
2397 | unifi_net_data_free(priv, &bulkdata->d[0]); | 2374 | unifi_net_data_free(priv, &bulkdata->d[0]); |
2398 | func_exit(); | ||
2399 | return; | 2375 | return; |
2400 | } | 2376 | } |
2401 | 2377 | ||
@@ -2419,15 +2395,12 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) | |||
2419 | list_add_tail(&rx_q_item->q, rx_list); | 2395 | list_add_tail(&rx_q_item->q, rx_list); |
2420 | up(&priv->rx_q_sem); | 2396 | up(&priv->rx_q_sem); |
2421 | 2397 | ||
2422 | func_exit(); | ||
2423 | return; | 2398 | return; |
2424 | 2399 | ||
2425 | } | 2400 | } |
2426 | 2401 | ||
2427 | indicate_rx_skb(priv, interfaceTag, da, sa, skb, signal, bulkdata); | 2402 | indicate_rx_skb(priv, interfaceTag, da, sa, skb, signal, bulkdata); |
2428 | 2403 | ||
2429 | func_exit(); | ||
2430 | |||
2431 | } /* unifi_rx() */ | 2404 | } /* unifi_rx() */ |
2432 | 2405 | ||
2433 | static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) | 2406 | static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata) |
@@ -2443,7 +2416,6 @@ static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d | |||
2443 | if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) | 2416 | if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) |
2444 | { | 2417 | { |
2445 | unifi_error(priv, "%s: MA-PACKET confirm with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); | 2418 | unifi_error(priv, "%s: MA-PACKET confirm with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); |
2446 | func_exit(); | ||
2447 | return; | 2419 | return; |
2448 | } | 2420 | } |
2449 | #ifdef CSR_SUPPORT_SME | 2421 | #ifdef CSR_SUPPORT_SME |
@@ -2466,7 +2438,6 @@ static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d | |||
2466 | interfacePriv->m4_hostTag = 0xffffffff; | 2438 | interfacePriv->m4_hostTag = 0xffffffff; |
2467 | } | 2439 | } |
2468 | #endif | 2440 | #endif |
2469 | func_exit(); | ||
2470 | return; | 2441 | return; |
2471 | } | 2442 | } |
2472 | 2443 | ||
@@ -2516,7 +2487,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d | |||
2516 | { | 2487 | { |
2517 | unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); | 2488 | unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); |
2518 | unifi_net_data_free(priv,&bulkdata->d[0]); | 2489 | unifi_net_data_free(priv,&bulkdata->d[0]); |
2519 | func_exit(); | ||
2520 | return; | 2490 | return; |
2521 | } | 2491 | } |
2522 | 2492 | ||
@@ -2525,14 +2495,12 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d | |||
2525 | { | 2495 | { |
2526 | unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __FUNCTION__, interfaceTag); | 2496 | unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __FUNCTION__, interfaceTag); |
2527 | unifi_net_data_free(priv, &bulkdata->d[0]); | 2497 | unifi_net_data_free(priv, &bulkdata->d[0]); |
2528 | func_exit(); | ||
2529 | return; | 2498 | return; |
2530 | } | 2499 | } |
2531 | 2500 | ||
2532 | if (bulkdata->d[0].data_length == 0) { | 2501 | if (bulkdata->d[0].data_length == 0) { |
2533 | unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __FUNCTION__); | 2502 | unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __FUNCTION__); |
2534 | unifi_net_data_free(priv,&bulkdata->d[0]); | 2503 | unifi_net_data_free(priv,&bulkdata->d[0]); |
2535 | func_exit(); | ||
2536 | return; | 2504 | return; |
2537 | } | 2505 | } |
2538 | /* For monitor mode we need to pass this indication to the registered application | 2506 | /* For monitor mode we need to pass this indication to the registered application |
@@ -2542,7 +2510,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d | |||
2542 | { | 2510 | { |
2543 | unifi_warning(priv, "%s: MA-PACKET indication with status = %d\n",__FUNCTION__, pkt_ind->ReceptionStatus); | 2511 | unifi_warning(priv, "%s: MA-PACKET indication with status = %d\n",__FUNCTION__, pkt_ind->ReceptionStatus); |
2544 | unifi_net_data_free(priv,&bulkdata->d[0]); | 2512 | unifi_net_data_free(priv,&bulkdata->d[0]); |
2545 | func_exit(); | ||
2546 | return; | 2513 | return; |
2547 | } | 2514 | } |
2548 | 2515 | ||
@@ -2590,13 +2557,11 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d | |||
2590 | } | 2557 | } |
2591 | #endif | 2558 | #endif |
2592 | unifi_net_data_free(priv,&bulkdata->d[0]); | 2559 | unifi_net_data_free(priv,&bulkdata->d[0]); |
2593 | func_exit(); | ||
2594 | return; | 2560 | return; |
2595 | } | 2561 | } |
2596 | if(frameType != IEEE802_11_FRAMETYPE_DATA) { | 2562 | if(frameType != IEEE802_11_FRAMETYPE_DATA) { |
2597 | unifi_warning(priv, "%s: Non control Non Data frame is received\n",__FUNCTION__); | 2563 | unifi_warning(priv, "%s: Non control Non Data frame is received\n",__FUNCTION__); |
2598 | unifi_net_data_free(priv,&bulkdata->d[0]); | 2564 | unifi_net_data_free(priv,&bulkdata->d[0]); |
2599 | func_exit(); | ||
2600 | return; | 2565 | return; |
2601 | } | 2566 | } |
2602 | 2567 | ||
@@ -2614,7 +2579,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d | |||
2614 | sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]); | 2579 | sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]); |
2615 | CsrWifiRouterCtrlUnexpectedFrameIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,interfaceTag,peerMacAddress); | 2580 | CsrWifiRouterCtrlUnexpectedFrameIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,interfaceTag,peerMacAddress); |
2616 | unifi_net_data_free(priv, &bulkdata->d[0]); | 2581 | unifi_net_data_free(priv, &bulkdata->d[0]); |
2617 | func_exit(); | ||
2618 | return; | 2582 | return; |
2619 | } | 2583 | } |
2620 | 2584 | ||
@@ -2720,7 +2684,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d | |||
2720 | up(&priv->ba_mutex); | 2684 | up(&priv->ba_mutex); |
2721 | process_ba_complete(priv, interfacePriv); | 2685 | process_ba_complete(priv, interfacePriv); |
2722 | 2686 | ||
2723 | func_exit(); | ||
2724 | } | 2687 | } |
2725 | /* | 2688 | /* |
2726 | * --------------------------------------------------------------------------- | 2689 | * --------------------------------------------------------------------------- |
@@ -2877,7 +2840,6 @@ netdev_mlme_event_handler(ul_client_t *pcli, const u8 *sig_packed, int sig_len, | |||
2877 | break; | 2840 | break; |
2878 | } | 2841 | } |
2879 | 2842 | ||
2880 | func_exit(); | ||
2881 | } /* netdev_mlme_event_handler() */ | 2843 | } /* netdev_mlme_event_handler() */ |
2882 | 2844 | ||
2883 | 2845 | ||
@@ -3313,7 +3275,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, | |||
3313 | if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) | 3275 | if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) |
3314 | { | 3276 | { |
3315 | unifi_error(priv, "%s: MaPacketErrorIndication indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); | 3277 | unifi_error(priv, "%s: MaPacketErrorIndication indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag); |
3316 | func_exit(); | ||
3317 | return; | 3278 | return; |
3318 | } | 3279 | } |
3319 | 3280 | ||
@@ -3321,7 +3282,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, | |||
3321 | UserPriority = pkt_err_ind->UserPriority; | 3282 | UserPriority = pkt_err_ind->UserPriority; |
3322 | if(UserPriority > 15) { | 3283 | if(UserPriority > 15) { |
3323 | unifi_error(priv, "%s: MaPacketErrorIndication indication with bad UserPriority=%d\n", __FUNCTION__, UserPriority); | 3284 | unifi_error(priv, "%s: MaPacketErrorIndication indication with bad UserPriority=%d\n", __FUNCTION__, UserPriority); |
3324 | func_exit(); | ||
3325 | } | 3285 | } |
3326 | sn = pkt_err_ind->SequenceNumber; | 3286 | sn = pkt_err_ind->SequenceNumber; |
3327 | 3287 | ||
@@ -3342,7 +3302,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, | |||
3342 | 3302 | ||
3343 | up(&priv->ba_mutex); | 3303 | up(&priv->ba_mutex); |
3344 | process_ba_complete(priv, interfacePriv); | 3304 | process_ba_complete(priv, interfacePriv); |
3345 | func_exit(); | ||
3346 | } | 3305 | } |
3347 | 3306 | ||
3348 | 3307 | ||
diff --git a/drivers/staging/csr/sdio_mmc.c b/drivers/staging/csr/sdio_mmc.c index 0b90630d332..862edb8934d 100644 --- a/drivers/staging/csr/sdio_mmc.c +++ b/drivers/staging/csr/sdio_mmc.c | |||
@@ -479,7 +479,6 @@ CsrSdioInterruptEnable(CsrSdioFunction *function) | |||
479 | #endif | 479 | #endif |
480 | _sdio_release_host(func); | 480 | _sdio_release_host(func); |
481 | 481 | ||
482 | func_exit(); | ||
483 | if (err) { | 482 | if (err) { |
484 | printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err); | 483 | printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err); |
485 | return ConvertSdioToCsrSdioResult(err); | 484 | return ConvertSdioToCsrSdioResult(err); |
@@ -506,7 +505,6 @@ CsrSdioInterruptDisable(CsrSdioFunction *function) | |||
506 | #endif | 505 | #endif |
507 | _sdio_release_host(func); | 506 | _sdio_release_host(func); |
508 | 507 | ||
509 | func_exit(); | ||
510 | if (err) { | 508 | if (err) { |
511 | printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err); | 509 | printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err); |
512 | return ConvertSdioToCsrSdioResult(err); | 510 | return ConvertSdioToCsrSdioResult(err); |
@@ -548,7 +546,6 @@ CsrSdioFunctionEnable(CsrSdioFunction *function) | |||
548 | unifi_error(NULL, "Failed to enable SDIO function %d\n", func->num); | 546 | unifi_error(NULL, "Failed to enable SDIO function %d\n", func->num); |
549 | } | 547 | } |
550 | 548 | ||
551 | func_exit(); | ||
552 | return ConvertSdioToCsrSdioResult(err); | 549 | return ConvertSdioToCsrSdioResult(err); |
553 | } /* CsrSdioFunctionEnable() */ | 550 | } /* CsrSdioFunctionEnable() */ |
554 | 551 | ||
@@ -580,7 +577,6 @@ CsrSdioFunctionDisable(CsrSdioFunction *function) | |||
580 | unifi_error(NULL, "Failed to disable SDIO function %d\n", func->num); | 577 | unifi_error(NULL, "Failed to disable SDIO function %d\n", func->num); |
581 | } | 578 | } |
582 | 579 | ||
583 | func_exit(); | ||
584 | return ConvertSdioToCsrSdioResult(err); | 580 | return ConvertSdioToCsrSdioResult(err); |
585 | } /* CsrSdioFunctionDisable() */ | 581 | } /* CsrSdioFunctionDisable() */ |
586 | 582 | ||
@@ -1096,7 +1092,6 @@ uf_glue_sdio_probe(struct sdio_func *func, | |||
1096 | wake_lock(&unifi_sdio_wake_lock); | 1092 | wake_lock(&unifi_sdio_wake_lock); |
1097 | #endif | 1093 | #endif |
1098 | 1094 | ||
1099 | func_exit(); | ||
1100 | return 0; | 1095 | return 0; |
1101 | } /* uf_glue_sdio_probe() */ | 1096 | } /* uf_glue_sdio_probe() */ |
1102 | 1097 | ||
@@ -1139,8 +1134,6 @@ uf_glue_sdio_remove(struct sdio_func *func) | |||
1139 | 1134 | ||
1140 | kfree(sdio_ctx); | 1135 | kfree(sdio_ctx); |
1141 | 1136 | ||
1142 | func_exit(); | ||
1143 | |||
1144 | } /* uf_glue_sdio_remove */ | 1137 | } /* uf_glue_sdio_remove */ |
1145 | 1138 | ||
1146 | 1139 | ||
@@ -1176,7 +1169,6 @@ uf_glue_sdio_suspend(struct device *dev) | |||
1176 | { | 1169 | { |
1177 | unifi_trace(NULL, UDBG1, "uf_glue_sdio_suspend"); | 1170 | unifi_trace(NULL, UDBG1, "uf_glue_sdio_suspend"); |
1178 | 1171 | ||
1179 | func_exit(); | ||
1180 | return 0; | 1172 | return 0; |
1181 | } /* uf_glue_sdio_suspend */ | 1173 | } /* uf_glue_sdio_suspend */ |
1182 | 1174 | ||
@@ -1204,7 +1196,6 @@ uf_glue_sdio_resume(struct device *dev) | |||
1204 | wake_lock(&unifi_sdio_wake_lock); | 1196 | wake_lock(&unifi_sdio_wake_lock); |
1205 | #endif | 1197 | #endif |
1206 | 1198 | ||
1207 | func_exit(); | ||
1208 | return 0; | 1199 | return 0; |
1209 | 1200 | ||
1210 | } /* uf_glue_sdio_resume */ | 1201 | } /* uf_glue_sdio_resume */ |
diff --git a/drivers/staging/csr/sme_native.c b/drivers/staging/csr/sme_native.c index dcecc86fb4a..525fe1bce0e 100644 --- a/drivers/staging/csr/sme_native.c +++ b/drivers/staging/csr/sme_native.c | |||
@@ -27,15 +27,11 @@ uf_sme_init(unifi_priv_t *priv) | |||
27 | { | 27 | { |
28 | int r = uf_init_wext_interface(priv); | 28 | int r = uf_init_wext_interface(priv); |
29 | if (r != 0) { | 29 | if (r != 0) { |
30 | func_exit(); | ||
31 | return r; | 30 | return r; |
32 | } | 31 | } |
33 | } | 32 | } |
34 | #endif | 33 | #endif |
35 | 34 | ||
36 | |||
37 | |||
38 | func_exit(); | ||
39 | return 0; | 35 | return 0; |
40 | } /* uf_sme_init() */ | 36 | } /* uf_sme_init() */ |
41 | 37 | ||
@@ -54,8 +50,6 @@ uf_sme_deinit(unifi_priv_t *priv) | |||
54 | uf_deinit_wext_interface(priv); | 50 | uf_deinit_wext_interface(priv); |
55 | #endif | 51 | #endif |
56 | 52 | ||
57 | |||
58 | func_exit(); | ||
59 | } /* uf_sme_deinit() */ | 53 | } /* uf_sme_deinit() */ |
60 | 54 | ||
61 | 55 | ||
@@ -327,8 +321,6 @@ sme_native_log_event(ul_client_t *pcli, | |||
327 | /* Wake any waiting user process */ | 321 | /* Wake any waiting user process */ |
328 | wake_up_interruptible(&client->udi_wq); | 322 | wake_up_interruptible(&client->udi_wq); |
329 | 323 | ||
330 | func_exit(); | ||
331 | |||
332 | } /* sme_native_log_event() */ | 324 | } /* sme_native_log_event() */ |
333 | 325 | ||
334 | 326 | ||
@@ -533,7 +525,6 @@ sme_native_mlme_event_handler(ul_client_t *pcli, | |||
533 | break; | 525 | break; |
534 | } | 526 | } |
535 | 527 | ||
536 | func_exit(); | ||
537 | } /* sme_native_mlme_event_handler() */ | 528 | } /* sme_native_mlme_event_handler() */ |
538 | 529 | ||
539 | 530 | ||
@@ -570,7 +561,6 @@ unifi_reset_state(unifi_priv_t *priv, unsigned char *macaddr, | |||
570 | priv->wext_conf.flag_associated = 0; | 561 | priv->wext_conf.flag_associated = 0; |
571 | #endif | 562 | #endif |
572 | 563 | ||
573 | func_exit(); | ||
574 | return r; | 564 | return r; |
575 | } /* unifi_reset_state() */ | 565 | } /* unifi_reset_state() */ |
576 | 566 | ||
diff --git a/drivers/staging/csr/sme_sys.c b/drivers/staging/csr/sme_sys.c index c9a819a1686..2b068197ed4 100644 --- a/drivers/staging/csr/sme_sys.c +++ b/drivers/staging/csr/sme_sys.c | |||
@@ -477,8 +477,6 @@ uf_send_gratuitous_arp(unifi_priv_t *priv, u16 interfaceTag) | |||
477 | return; | 477 | return; |
478 | } | 478 | } |
479 | 479 | ||
480 | func_exit(); | ||
481 | |||
482 | } | 480 | } |
483 | #endif /* CSR_WIFI_SEND_GRATUITOUS_ARP */ | 481 | #endif /* CSR_WIFI_SEND_GRATUITOUS_ARP */ |
484 | 482 | ||
diff --git a/drivers/staging/csr/sme_wext.c b/drivers/staging/csr/sme_wext.c index 461b8692a05..9b8385b5142 100644 --- a/drivers/staging/csr/sme_wext.c +++ b/drivers/staging/csr/sme_wext.c | |||
@@ -823,7 +823,6 @@ iwprivsconfwapi(struct net_device *dev, struct iw_request_info *info, | |||
823 | ~(CSR_WIFI_SME_ENCRYPTION_CIPHER_PAIRWISE_SMS4 | CSR_WIFI_SME_ENCRYPTION_CIPHER_GROUP_SMS4); | 823 | ~(CSR_WIFI_SME_ENCRYPTION_CIPHER_PAIRWISE_SMS4 | CSR_WIFI_SME_ENCRYPTION_CIPHER_GROUP_SMS4); |
824 | } | 824 | } |
825 | 825 | ||
826 | func_exit(); | ||
827 | return 0; | 826 | return 0; |
828 | } | 827 | } |
829 | 828 | ||
@@ -880,7 +879,6 @@ iwprivswpikey(struct net_device *dev, struct iw_request_info *info, | |||
880 | return convert_sme_error(r); | 879 | return convert_sme_error(r); |
881 | } | 880 | } |
882 | 881 | ||
883 | func_exit(); | ||
884 | return r; | 882 | return r; |
885 | } | 883 | } |
886 | #endif | 884 | #endif |
@@ -932,7 +930,6 @@ unifi_siwfreq(struct net_device *dev, struct iw_request_info *info, | |||
932 | priv->connection_config.adhocChannel = wext_freq_to_channel(freq->m, freq->e); | 930 | priv->connection_config.adhocChannel = wext_freq_to_channel(freq->m, freq->e); |
933 | } | 931 | } |
934 | 932 | ||
935 | func_exit(); | ||
936 | return 0; | 933 | return 0; |
937 | } /* unifi_siwfreq() */ | 934 | } /* unifi_siwfreq() */ |
938 | 935 | ||
@@ -966,7 +963,6 @@ unifi_giwfreq(struct net_device *dev, struct iw_request_info *info, | |||
966 | (connectionInfo.networkType80211 == CSR_WIFI_SME_RADIO_IF_GHZ_5_0)); | 963 | (connectionInfo.networkType80211 == CSR_WIFI_SME_RADIO_IF_GHZ_5_0)); |
967 | freq->e = 6; | 964 | freq->e = 6; |
968 | 965 | ||
969 | func_exit(); | ||
970 | return convert_sme_error(err); | 966 | return convert_sme_error(err); |
971 | } /* unifi_giwfreq() */ | 967 | } /* unifi_giwfreq() */ |
972 | 968 | ||
@@ -1006,7 +1002,6 @@ unifi_siwmode(struct net_device *dev, struct iw_request_info *info, | |||
1006 | priv->connection_config.ssid.length = 0; | 1002 | priv->connection_config.ssid.length = 0; |
1007 | memset(priv->connection_config.bssid.a, 0xFF, ETH_ALEN); | 1003 | memset(priv->connection_config.bssid.a, 0xFF, ETH_ALEN); |
1008 | 1004 | ||
1009 | func_exit(); | ||
1010 | return 0; | 1005 | return 0; |
1011 | } /* unifi_siwmode() */ | 1006 | } /* unifi_siwmode() */ |
1012 | 1007 | ||
@@ -1063,7 +1058,6 @@ unifi_giwmode(struct net_device *dev, struct iw_request_info *info, | |||
1063 | 1058 | ||
1064 | } | 1059 | } |
1065 | unifi_trace(priv, UDBG4, "unifi_giwmode: mode = 0x%x\n", wrqu->mode); | 1060 | unifi_trace(priv, UDBG4, "unifi_giwmode: mode = 0x%x\n", wrqu->mode); |
1066 | func_exit(); | ||
1067 | return r; | 1061 | return r; |
1068 | } /* unifi_giwmode() */ | 1062 | } /* unifi_giwmode() */ |
1069 | 1063 | ||
@@ -1227,11 +1221,9 @@ unifi_siwap(struct net_device *dev, struct iw_request_info *info, | |||
1227 | err = sme_mgt_connect(priv); | 1221 | err = sme_mgt_connect(priv); |
1228 | if (err) { | 1222 | if (err) { |
1229 | unifi_error(priv, "unifi_siwap: Join failed, status %d\n", err); | 1223 | unifi_error(priv, "unifi_siwap: Join failed, status %d\n", err); |
1230 | func_exit(); | ||
1231 | return convert_sme_error(err); | 1224 | return convert_sme_error(err); |
1232 | } | 1225 | } |
1233 | } | 1226 | } |
1234 | func_exit(); | ||
1235 | 1227 | ||
1236 | return 0; | 1228 | return 0; |
1237 | } /* unifi_siwap() */ | 1229 | } /* unifi_siwap() */ |
@@ -1271,7 +1263,6 @@ unifi_giwap(struct net_device *dev, struct iw_request_info *info, | |||
1271 | memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN); | 1263 | memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN); |
1272 | } | 1264 | } |
1273 | 1265 | ||
1274 | func_exit(); | ||
1275 | return 0; | 1266 | return 0; |
1276 | } /* unifi_giwap() */ | 1267 | } /* unifi_giwap() */ |
1277 | 1268 | ||
@@ -1354,7 +1345,6 @@ unifi_siwscan(struct net_device *dev, struct iw_request_info *info, | |||
1354 | kfree(channel_list); | 1345 | kfree(channel_list); |
1355 | } | 1346 | } |
1356 | 1347 | ||
1357 | func_exit(); | ||
1358 | return r; | 1348 | return r; |
1359 | 1349 | ||
1360 | } /* unifi_siwscan() */ | 1350 | } /* unifi_siwscan() */ |
@@ -1747,11 +1737,9 @@ unifi_siwessid(struct net_device *dev, struct iw_request_info *info, | |||
1747 | UF_RTNL_LOCK(); | 1737 | UF_RTNL_LOCK(); |
1748 | if (err) { | 1738 | if (err) { |
1749 | unifi_error(priv, "unifi_siwessid: Join failed, status %d\n", err); | 1739 | unifi_error(priv, "unifi_siwessid: Join failed, status %d\n", err); |
1750 | func_exit(); | ||
1751 | return convert_sme_error(err); | 1740 | return convert_sme_error(err); |
1752 | } | 1741 | } |
1753 | 1742 | ||
1754 | func_exit(); | ||
1755 | return 0; | 1743 | return 0; |
1756 | } /* unifi_siwessid() */ | 1744 | } /* unifi_siwessid() */ |
1757 | 1745 | ||
@@ -1791,7 +1779,6 @@ unifi_giwessid(struct net_device *dev, struct iw_request_info *info, | |||
1791 | data->length, essid); | 1779 | data->length, essid); |
1792 | } | 1780 | } |
1793 | 1781 | ||
1794 | func_exit(); | ||
1795 | 1782 | ||
1796 | return 0; | 1783 | return 0; |
1797 | } /* unifi_giwessid() */ | 1784 | } /* unifi_giwessid() */ |
@@ -1847,7 +1834,6 @@ unifi_siwrate(struct net_device *dev, struct iw_request_info *info, | |||
1847 | return r; | 1834 | return r; |
1848 | } | 1835 | } |
1849 | 1836 | ||
1850 | func_exit(); | ||
1851 | 1837 | ||
1852 | return 0; | 1838 | return 0; |
1853 | } /* unifi_siwrate() */ | 1839 | } /* unifi_siwrate() */ |
@@ -1896,8 +1882,6 @@ unifi_giwrate(struct net_device *dev, struct iw_request_info *info, | |||
1896 | args->value = bitrate * 500000; | 1882 | args->value = bitrate * 500000; |
1897 | args->fixed = !flag; | 1883 | args->fixed = !flag; |
1898 | 1884 | ||
1899 | func_exit(); | ||
1900 | |||
1901 | return 0; | 1885 | return 0; |
1902 | } /* unifi_giwrate() */ | 1886 | } /* unifi_giwrate() */ |
1903 | 1887 | ||
@@ -2473,7 +2457,6 @@ unifi_siwmlme(struct net_device *dev, struct iw_request_info *info, | |||
2473 | return -EOPNOTSUPP; | 2457 | return -EOPNOTSUPP; |
2474 | } | 2458 | } |
2475 | 2459 | ||
2476 | func_exit(); | ||
2477 | return 0; | 2460 | return 0; |
2478 | } /* unifi_siwmlme() */ | 2461 | } /* unifi_siwmlme() */ |
2479 | 2462 | ||
@@ -2528,20 +2511,17 @@ unifi_siwgenie(struct net_device *dev, struct iw_request_info *info, | |||
2528 | 2511 | ||
2529 | len = wrqu->data.length; | 2512 | len = wrqu->data.length; |
2530 | if (len == 0) { | 2513 | if (len == 0) { |
2531 | func_exit(); | ||
2532 | return 0; | 2514 | return 0; |
2533 | } | 2515 | } |
2534 | 2516 | ||
2535 | priv->connection_config.mlmeAssociateReqInformationElements = kmalloc(len, GFP_KERNEL); | 2517 | priv->connection_config.mlmeAssociateReqInformationElements = kmalloc(len, GFP_KERNEL); |
2536 | if (priv->connection_config.mlmeAssociateReqInformationElements == NULL) { | 2518 | if (priv->connection_config.mlmeAssociateReqInformationElements == NULL) { |
2537 | func_exit(); | ||
2538 | return -ENOMEM; | 2519 | return -ENOMEM; |
2539 | } | 2520 | } |
2540 | 2521 | ||
2541 | priv->connection_config.mlmeAssociateReqInformationElementsLength = len; | 2522 | priv->connection_config.mlmeAssociateReqInformationElementsLength = len; |
2542 | memcpy( priv->connection_config.mlmeAssociateReqInformationElements, extra, len); | 2523 | memcpy( priv->connection_config.mlmeAssociateReqInformationElements, extra, len); |
2543 | 2524 | ||
2544 | func_exit(); | ||
2545 | return 0; | 2525 | return 0; |
2546 | } /* unifi_siwgenie() */ | 2526 | } /* unifi_siwgenie() */ |
2547 | 2527 | ||
@@ -2578,7 +2558,6 @@ unifi_giwgenie(struct net_device *dev, struct iw_request_info *info, | |||
2578 | wrqu->data.length = len; | 2558 | wrqu->data.length = len; |
2579 | memcpy(extra, priv->connection_config.mlmeAssociateReqInformationElements, len); | 2559 | memcpy(extra, priv->connection_config.mlmeAssociateReqInformationElements, len); |
2580 | 2560 | ||
2581 | func_exit(); | ||
2582 | return 0; | 2561 | return 0; |
2583 | } /* unifi_giwgenie() */ | 2562 | } /* unifi_giwgenie() */ |
2584 | 2563 | ||
@@ -2826,7 +2805,6 @@ _unifi_siwauth(struct net_device *dev, struct iw_request_info *info, | |||
2826 | } | 2805 | } |
2827 | 2806 | ||
2828 | unifi_trace(priv, UDBG2, "authModeMask = %d", priv->connection_config.authModeMask); | 2807 | unifi_trace(priv, UDBG2, "authModeMask = %d", priv->connection_config.authModeMask); |
2829 | func_exit(); | ||
2830 | 2808 | ||
2831 | return 0; | 2809 | return 0; |
2832 | } /* _unifi_siwauth() */ | 2810 | } /* _unifi_siwauth() */ |
@@ -3037,7 +3015,6 @@ _unifi_siwencodeext(struct net_device *dev, struct iw_request_info *info, | |||
3037 | return convert_sme_error(r); | 3015 | return convert_sme_error(r); |
3038 | } | 3016 | } |
3039 | 3017 | ||
3040 | func_exit(); | ||
3041 | return r; | 3018 | return r; |
3042 | } /* _unifi_siwencodeext() */ | 3019 | } /* _unifi_siwencodeext() */ |
3043 | 3020 | ||
diff --git a/drivers/staging/csr/unifi_event.c b/drivers/staging/csr/unifi_event.c index f684b93e627..e81a9987827 100644 --- a/drivers/staging/csr/unifi_event.c +++ b/drivers/staging/csr/unifi_event.c | |||
@@ -521,7 +521,6 @@ unifi_process_receive_event(void *ospriv, | |||
521 | unifi_net_data_free(priv, (void *)&bulkdata->d[i]); | 521 | unifi_net_data_free(priv, (void *)&bulkdata->d[i]); |
522 | } | 522 | } |
523 | } | 523 | } |
524 | func_exit(); | ||
525 | return; | 524 | return; |
526 | } | 525 | } |
527 | } /* CSR_MA_PACKET_INDICATION_ID */ | 526 | } /* CSR_MA_PACKET_INDICATION_ID */ |
@@ -571,7 +570,6 @@ unifi_process_receive_event(void *ospriv, | |||
571 | } | 570 | } |
572 | } | 571 | } |
573 | 572 | ||
574 | func_exit(); | ||
575 | } /* unifi_process_receive_event() */ | 573 | } /* unifi_process_receive_event() */ |
576 | 574 | ||
577 | 575 | ||
@@ -602,7 +600,6 @@ void unifi_rx_queue_flush(void *ospriv) | |||
602 | } | 600 | } |
603 | priv->rxSignalBuffer.readPointer = readPointer; | 601 | priv->rxSignalBuffer.readPointer = readPointer; |
604 | } | 602 | } |
605 | func_exit(); | ||
606 | } | 603 | } |
607 | 604 | ||
608 | void rx_wq_handler(struct work_struct *work) | 605 | void rx_wq_handler(struct work_struct *work) |
@@ -691,6 +688,5 @@ unifi_receive_event(void *ospriv, | |||
691 | #else | 688 | #else |
692 | unifi_process_receive_event(ospriv, sigdata, siglen, bulkdata); | 689 | unifi_process_receive_event(ospriv, sigdata, siglen, bulkdata); |
693 | #endif | 690 | #endif |
694 | func_exit(); | ||
695 | } /* unifi_receive_event() */ | 691 | } /* unifi_receive_event() */ |
696 | 692 | ||
diff --git a/drivers/staging/csr/unifi_os.h b/drivers/staging/csr/unifi_os.h index 13c7d86d7ce..c72b3a6266a 100644 --- a/drivers/staging/csr/unifi_os.h +++ b/drivers/staging/csr/unifi_os.h | |||
@@ -61,12 +61,6 @@ extern int unifi_debug; | |||
61 | * etc. | 61 | * etc. |
62 | */ | 62 | */ |
63 | 63 | ||
64 | #define func_exit() \ | ||
65 | do { \ | ||
66 | if (unifi_debug >= 5) { \ | ||
67 | printk("unifi: <= %s\n", __FUNCTION__); \ | ||
68 | } \ | ||
69 | } while (0) | ||
70 | #define func_exit_r(_rc) \ | 64 | #define func_exit_r(_rc) \ |
71 | do { \ | 65 | do { \ |
72 | if (unifi_debug >= 5) { \ | 66 | if (unifi_debug >= 5) { \ |
@@ -101,7 +95,6 @@ void unifi_trace(void* ospriv, int level, const char *fmt, ...); | |||
101 | #else | 95 | #else |
102 | 96 | ||
103 | /* Stubs */ | 97 | /* Stubs */ |
104 | #define func_exit() | ||
105 | #define func_exit_r(_rc) | 98 | #define func_exit_r(_rc) |
106 | 99 | ||
107 | #define ASSERT(cond) | 100 | #define ASSERT(cond) |
diff --git a/drivers/staging/csr/unifi_pdu_processing.c b/drivers/staging/csr/unifi_pdu_processing.c index 453a2afd9b8..95efc360cc2 100644 --- a/drivers/staging/csr/unifi_pdu_processing.c +++ b/drivers/staging/csr/unifi_pdu_processing.c | |||
@@ -408,7 +408,6 @@ CsrResult enque_tx_data_pdu(unifi_priv_t *priv, bulk_data_param_t *bulkdata, | |||
408 | unifi_error(priv, | 408 | unifi_error(priv, |
409 | "Failed to allocate %d bytes for tx packet record\n", | 409 | "Failed to allocate %d bytes for tx packet record\n", |
410 | sizeof(tx_buffered_packets_t)); | 410 | sizeof(tx_buffered_packets_t)); |
411 | func_exit(); | ||
412 | return CSR_RESULT_FAILURE; | 411 | return CSR_RESULT_FAILURE; |
413 | } | 412 | } |
414 | 413 | ||
@@ -2131,7 +2130,6 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata, | |||
2131 | unifi_error(priv, | 2130 | unifi_error(priv, |
2132 | "uf_process_ma_vif_availibility_ind: Received unknown signal 0x%.4X.\n", | 2131 | "uf_process_ma_vif_availibility_ind: Received unknown signal 0x%.4X.\n", |
2133 | CSR_GET_UINT16_FROM_LITTLE_ENDIAN(sigdata)); | 2132 | CSR_GET_UINT16_FROM_LITTLE_ENDIAN(sigdata)); |
2134 | func_exit(); | ||
2135 | return; | 2133 | return; |
2136 | } | 2134 | } |
2137 | ind = &signal.u.MaVifAvailabilityIndication; | 2135 | ind = &signal.u.MaVifAvailabilityIndication; |
@@ -2394,8 +2392,6 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv, | |||
2394 | } | 2392 | } |
2395 | } | 2393 | } |
2396 | 2394 | ||
2397 | func_exit(); | ||
2398 | |||
2399 | } | 2395 | } |
2400 | 2396 | ||
2401 | void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) | 2397 | void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) |
@@ -2445,7 +2441,6 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) | |||
2445 | interfacePriv->dtimActive = FALSE; | 2441 | interfacePriv->dtimActive = FALSE; |
2446 | } | 2442 | } |
2447 | } | 2443 | } |
2448 | func_exit(); | ||
2449 | return; | 2444 | return; |
2450 | } | 2445 | } |
2451 | if(priv->pausedStaHandle[queue] > 7) { | 2446 | if(priv->pausedStaHandle[queue] > 7) { |
@@ -2536,7 +2531,6 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q) | |||
2536 | */ | 2531 | */ |
2537 | unifi_trace(priv, UDBG4, "csrWifiHipSendBufferedFrames: UAPSD Resume Q=%x\n", queue); | 2532 | unifi_trace(priv, UDBG4, "csrWifiHipSendBufferedFrames: UAPSD Resume Q=%x\n", queue); |
2538 | resume_suspended_uapsd(priv, interfaceTag); | 2533 | resume_suspended_uapsd(priv, interfaceTag); |
2539 | func_exit(); | ||
2540 | } | 2534 | } |
2541 | 2535 | ||
2542 | 2536 | ||
@@ -2816,7 +2810,6 @@ void uf_send_qos_null(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI | |||
2816 | unifi_net_data_free(priv, &bulkdata.d[0]); | 2810 | unifi_net_data_free(priv, &bulkdata.d[0]); |
2817 | } | 2811 | } |
2818 | 2812 | ||
2819 | func_exit(); | ||
2820 | return; | 2813 | return; |
2821 | 2814 | ||
2822 | } | 2815 | } |
@@ -2901,7 +2894,6 @@ void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI | |||
2901 | srcStaInfo->nullDataHostTag = INVALID_HOST_TAG; | 2894 | srcStaInfo->nullDataHostTag = INVALID_HOST_TAG; |
2902 | } | 2895 | } |
2903 | 2896 | ||
2904 | func_exit(); | ||
2905 | return; | 2897 | return; |
2906 | } | 2898 | } |
2907 | 2899 | ||
@@ -3347,7 +3339,6 @@ void uf_prepare_send_cfm_list_for_queued_pkts(unifi_priv_t * priv, | |||
3347 | 3339 | ||
3348 | spin_unlock_irqrestore(&priv->tx_q_lock,lock_flags); | 3340 | spin_unlock_irqrestore(&priv->tx_q_lock,lock_flags); |
3349 | 3341 | ||
3350 | func_exit(); | ||
3351 | } | 3342 | } |
3352 | 3343 | ||
3353 | 3344 | ||
@@ -3661,7 +3652,6 @@ void resume_unicast_buffered_frames(unifi_priv_t *priv, u16 interfaceTag) | |||
3661 | } | 3652 | } |
3662 | } | 3653 | } |
3663 | } | 3654 | } |
3664 | func_exit(); | ||
3665 | } | 3655 | } |
3666 | void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interfaceTag) | 3656 | void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interfaceTag) |
3667 | { | 3657 | { |
@@ -3688,7 +3678,6 @@ void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interface | |||
3688 | } | 3678 | } |
3689 | spin_unlock_irqrestore(&priv->tx_q_lock,lock_flags); | 3679 | spin_unlock_irqrestore(&priv->tx_q_lock,lock_flags); |
3690 | } | 3680 | } |
3691 | func_exit(); | ||
3692 | } | 3681 | } |
3693 | 3682 | ||
3694 | /* | 3683 | /* |
diff --git a/drivers/staging/csr/unifi_sme.c b/drivers/staging/csr/unifi_sme.c index 86fcec6c1b4..7c6c4138fc7 100644 --- a/drivers/staging/csr/unifi_sme.c +++ b/drivers/staging/csr/unifi_sme.c | |||
@@ -80,20 +80,17 @@ sme_log_event(ul_client_t *pcli, | |||
80 | 80 | ||
81 | /* Just a sanity check */ | 81 | /* Just a sanity check */ |
82 | if ((signal == NULL) || (signal_len <= 0)) { | 82 | if ((signal == NULL) || (signal_len <= 0)) { |
83 | func_exit(); | ||
84 | return; | 83 | return; |
85 | } | 84 | } |
86 | 85 | ||
87 | priv = uf_find_instance(pcli->instance); | 86 | priv = uf_find_instance(pcli->instance); |
88 | if (!priv) { | 87 | if (!priv) { |
89 | unifi_error(priv, "sme_log_event: invalid priv\n"); | 88 | unifi_error(priv, "sme_log_event: invalid priv\n"); |
90 | func_exit(); | ||
91 | return; | 89 | return; |
92 | } | 90 | } |
93 | 91 | ||
94 | if (priv->smepriv == NULL) { | 92 | if (priv->smepriv == NULL) { |
95 | unifi_error(priv, "sme_log_event: invalid smepriv\n"); | 93 | unifi_error(priv, "sme_log_event: invalid smepriv\n"); |
96 | func_exit(); | ||
97 | return; | 94 | return; |
98 | } | 95 | } |
99 | 96 | ||
@@ -108,7 +105,6 @@ sme_log_event(ul_client_t *pcli, | |||
108 | if ((unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_DEBUG_STRING_INDICATION_ID) || | 105 | if ((unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_DEBUG_STRING_INDICATION_ID) || |
109 | (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_DEBUG_WORD16_INDICATION_ID)) | 106 | (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_DEBUG_WORD16_INDICATION_ID)) |
110 | { | 107 | { |
111 | func_exit(); | ||
112 | return; | 108 | return; |
113 | } | 109 | } |
114 | if (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_MA_PACKET_INDICATION_ID) | 110 | if (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_MA_PACKET_INDICATION_ID) |
@@ -170,7 +166,6 @@ sme_log_event(ul_client_t *pcli, | |||
170 | if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) | 166 | if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) |
171 | { | 167 | { |
172 | unifi_error(priv, "Bad MA_PACKET_CONFIRM interfaceTag %d\n", interfaceTag); | 168 | unifi_error(priv, "Bad MA_PACKET_CONFIRM interfaceTag %d\n", interfaceTag); |
173 | func_exit(); | ||
174 | return; | 169 | return; |
175 | } | 170 | } |
176 | 171 | ||
@@ -218,7 +213,6 @@ sme_log_event(ul_client_t *pcli, | |||
218 | } else { | 213 | } else { |
219 | unifi_trace(priv, UDBG1, "%s: M4 received from netdevice\n", __FUNCTION__); | 214 | unifi_trace(priv, UDBG1, "%s: M4 received from netdevice\n", __FUNCTION__); |
220 | } | 215 | } |
221 | func_exit(); | ||
222 | return; | 216 | return; |
223 | } | 217 | } |
224 | } | 218 | } |
@@ -247,7 +241,6 @@ sme_log_event(ul_client_t *pcli, | |||
247 | dataref1.length, dataref1.data, | 241 | dataref1.length, dataref1.data, |
248 | dataref2.length, dataref2.data); | 242 | dataref2.length, dataref2.data); |
249 | 243 | ||
250 | func_exit(); | ||
251 | } /* sme_log_event() */ | 244 | } /* sme_log_event() */ |
252 | 245 | ||
253 | 246 | ||
@@ -1168,8 +1161,6 @@ uf_send_m4_ready_wq(struct work_struct *work) | |||
1168 | unifi_trace(priv, UDBG1, "M4ReadyToSendInd sent for peer %pMF\n", | 1161 | unifi_trace(priv, UDBG1, "M4ReadyToSendInd sent for peer %pMF\n", |
1169 | peer.a); | 1162 | peer.a); |
1170 | 1163 | ||
1171 | func_exit(); | ||
1172 | |||
1173 | } /* uf_send_m4_ready_wq() */ | 1164 | } /* uf_send_m4_ready_wq() */ |
1174 | 1165 | ||
1175 | #if (defined(CSR_WIFI_SECURITY_WAPI_ENABLE) && defined(CSR_WIFI_SECURITY_WAPI_SW_ENCRYPTION)) | 1166 | #if (defined(CSR_WIFI_SECURITY_WAPI_ENABLE) && defined(CSR_WIFI_SECURITY_WAPI_SW_ENCRYPTION)) |
@@ -1226,7 +1217,6 @@ void uf_send_pkt_to_encrypt(struct work_struct *work) | |||
1226 | 1217 | ||
1227 | kfree(pktBulkData); /* Would have been copied over by the SME Handler */ | 1218 | kfree(pktBulkData); /* Would have been copied over by the SME Handler */ |
1228 | 1219 | ||
1229 | func_exit(); | ||
1230 | } else { | 1220 | } else { |
1231 | unifi_warning(priv, "uf_send_pkt_to_encrypt() is NOT applicable for interface mode - %d\n",interfacePriv->interfaceMode); | 1221 | unifi_warning(priv, "uf_send_pkt_to_encrypt() is NOT applicable for interface mode - %d\n",interfacePriv->interfaceMode); |
1232 | } | 1222 | } |