aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/csr
diff options
context:
space:
mode:
authorDevendra Naga <devendra.aaru@gmail.com>2012-10-27 02:09:59 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-29 14:54:34 -0700
commit75254af8908501f9cfc6be878c595da02859a0b5 (patch)
treea8ce622d23c5b336ba5821183edebcfbc69ba262 /drivers/staging/csr
parent438d2d1329914da8fdf3a8aedac8ce7e5ffad26d (diff)
downloadlinaro-lsk-75254af8908501f9cfc6be878c595da02859a0b5.tar.gz
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.c37
-rw-r--r--drivers/staging/csr/csr_wifi_hip_download.c3
-rw-r--r--drivers/staging/csr/csr_wifi_hip_dump.c4
-rw-r--r--drivers/staging/csr/csr_wifi_hip_send.c2
-rw-r--r--drivers/staging/csr/drv.c19
-rw-r--r--drivers/staging/csr/firmware.c5
-rw-r--r--drivers/staging/csr/io.c9
-rw-r--r--drivers/staging/csr/mlme.c1
-rw-r--r--drivers/staging/csr/monitor.c3
-rw-r--r--drivers/staging/csr/netdev.c41
-rw-r--r--drivers/staging/csr/sdio_mmc.c9
-rw-r--r--drivers/staging/csr/sme_native.c10
-rw-r--r--drivers/staging/csr/sme_sys.c2
-rw-r--r--drivers/staging/csr/sme_wext.c23
-rw-r--r--drivers/staging/csr/unifi_event.c4
-rw-r--r--drivers/staging/csr/unifi_os.h7
-rw-r--r--drivers/staging/csr/unifi_pdu_processing.c11
-rw-r--r--drivers/staging/csr/unifi_sme.c10
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)
}
}
#endif
- func_exit();
return card;
} /* unifi_alloc_card() */
@@ -196,7 +195,6 @@ CsrResult unifi_init_card(card_t *card, s32 led_mask)
return r;
}
- func_exit();
return CSR_RESULT_SUCCESS;
}
@@ -389,8 +387,6 @@ CsrResult unifi_download(card_t *card, s32 led_mask)
/* Free the firmware file information. */
unifi_fw_read_stop(card->ospriv, dlpriv);
- func_exit();
-
return CSR_RESULT_SUCCESS;
} /* unifi_download() */
@@ -474,8 +470,6 @@ static CsrResult unifi_hip_init(card_t *card)
return r;
}
- func_exit();
-
return CSR_RESULT_SUCCESS;
} /* unifi_hip_init() */
@@ -967,7 +961,6 @@ static CsrResult card_hw_init(card_t *card)
*/
unifi_read_panic(card);
- func_exit();
return CSR_RESULT_SUCCESS;
} /* card_hw_init() */
@@ -1094,7 +1087,6 @@ static CsrResult card_wait_for_unifi_to_reset(card_t *card)
r = CSR_RESULT_FAILURE;
}
- func_exit();
return r;
} /* card_wait_for_unifi_to_reset() */
@@ -1128,7 +1120,6 @@ static CsrResult card_wait_for_unifi_to_disable(card_t *card)
unifi_error(card->ospriv,
"Function reset method not supported for chip_id=%d\n",
card->chip_id);
- func_exit();
return CSR_RESULT_FAILURE;
}
@@ -1195,7 +1186,6 @@ static CsrResult card_wait_for_unifi_to_disable(card_t *card)
r = CSR_RESULT_FAILURE;
}
- func_exit();
return r;
} /* card_wait_for_unifi_to_reset() */
@@ -1319,7 +1309,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr)
*paddr = (((u32)mbox1 << 16) | mbox0);
- func_exit();
return CSR_RESULT_SUCCESS;
} /* card_wait_for_firmware_to_start() */
@@ -1347,7 +1336,6 @@ CsrResult unifi_capture_panic(card_t *card)
*/
if (!card->panic_data_phy_addr || !card->panic_data_mac_addr)
{
- func_exit();
return CSR_RESULT_SUCCESS;
}
@@ -1362,7 +1350,6 @@ CsrResult unifi_capture_panic(card_t *card)
unifi_info(card->ospriv, "Unable to read panic codes");
}
- func_exit();
return CSR_RESULT_SUCCESS;
}
@@ -1562,7 +1549,6 @@ void unifi_read_panic(card_t *card)
card->last_mac_panic_arg = p_arg;
}
- func_exit();
}
@@ -1712,7 +1698,6 @@ static CsrResult card_allocate_memory_resources(card_t *card)
card->memory_resources_allocated = 1;
- func_exit();
return CSR_RESULT_SUCCESS;
} /* card_allocate_memory_resources() */
@@ -1787,7 +1772,6 @@ static void card_free_memory_resources(card_t *card)
card->memory_resources_allocated = 0;
- func_exit();
} /* card_free_memory_resources() */
@@ -1811,7 +1795,6 @@ static void card_init_soft_queues(card_t *card)
#ifndef CSR_WIFI_HIP_TA_DISABLE
unifi_ta_sampling_init(card);
#endif
- func_exit();
}
@@ -1899,7 +1882,6 @@ void unifi_cancel_pending_signals(card_t *card)
card_init_soft_queues(card);
- func_exit();
} /* unifi_cancel_pending_signals() */
@@ -1938,7 +1920,6 @@ void unifi_free_card(card_t *card)
kfree(card);
- func_exit();
} /* unifi_free_card() */
@@ -2051,7 +2032,6 @@ static CsrResult card_init_slots(card_t *card)
card->dynamic_slot_data.packets_interval = UNIFI_PACKETS_INTERVAL;
- func_exit();
return CSR_RESULT_SUCCESS;
} /* card_init_slots() */
@@ -2143,7 +2123,6 @@ static void CardReassignDynamicReservation(card_t *card)
}
card->dynamic_slot_data.total_packets_txed = 0;
- func_exit();
}
@@ -2180,7 +2159,6 @@ static void CardCheckDynamicReservation(card_t *card, unifi_TrafficQueue queue)
if (q_len <= card->dynamic_slot_data.from_host_reserved_slots[queue])
{
unifi_trace(card->ospriv, UDBG5, "queue %d q_len %d already has that many reserved slots, exiting\n", queue, q_len);
- func_exit();
return;
}
@@ -2278,7 +2256,6 @@ static void CardCheckDynamicReservation(card_t *card, unifi_TrafficQueue queue)
card->dynamic_slot_data.from_host_max_slots[i]);
}
- func_exit();
}
@@ -2306,7 +2283,6 @@ void CardClearFromHostDataSlot(card_t *card, const s16 slot)
unifi_warning(card->ospriv,
"Surprise: request to clear an already free FH data slot: %d\n",
slot);
- func_exit();
return;
}
@@ -2342,7 +2318,6 @@ void CardClearFromHostDataSlot(card_t *card, const s16 slot)
unifi_trace(card->ospriv, UDBG4, "CardClearFromHostDataSlot: slot %d recycled %p\n", slot, os_data_ptr);
- func_exit();
} /* CardClearFromHostDataSlot() */
@@ -2430,7 +2405,6 @@ u16 CardGetFreeFromHostDataSlots(card_t *card)
}
}
- func_exit();
return n;
} /* CardGetFreeFromHostDataSlots() */
@@ -2490,7 +2464,6 @@ static CsrResult unifi_identify_hw(card_t *card)
ChipHelper_MarketingName(card->helper),
ChipHelper_FriendlyName(card->helper));
- func_exit();
return CSR_RESULT_SUCCESS;
} /* unifi_identify_hw() */
@@ -2572,7 +2545,6 @@ static CsrResult unifi_prepare_hw(card_t *card)
return r;
}
- func_exit();
return CSR_RESULT_SUCCESS;
} /* unifi_prepare_hw() */
@@ -2842,7 +2814,6 @@ static CsrResult card_reset_method_io_enable(card_t *card)
unifi_warning(card->ospriv, "card_reset_method_io_enable failed to reset UniFi\n");
}
- func_exit();
return r;
} /* card_reset_method_io_enable() */
@@ -2894,7 +2865,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card)
if (r != CSR_RESULT_SUCCESS)
{
unifi_error(card->ospriv, "Can't stop processors\n");
- func_exit();
return r;
}
@@ -2930,7 +2900,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card)
unifi_warning(card->ospriv, "card_reset_method_dbg_reset failed to reset UniFi\n");
}
- func_exit();
return r;
} /* card_reset_method_dbg_reset() */
@@ -2976,7 +2945,6 @@ CsrResult unifi_card_hard_reset(card_t *card)
if (r != CSR_RESULT_SUCCESS)
{
unifi_error(card->ospriv, "unifi_card_hard_reset failed to identify h/w\n");
- func_exit();
return r;
}
@@ -3006,7 +2974,6 @@ CsrResult unifi_card_hard_reset(card_t *card)
}
if (r == CSR_RESULT_SUCCESS)
{
- func_exit();
return r;
}
}
@@ -3069,7 +3036,6 @@ CsrResult CardGenInt(card_t *card)
card->unifi_interrupt_seq++;
- func_exit();
return CSR_RESULT_SUCCESS;
} /* CardGenInt() */
@@ -3414,7 +3380,6 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue
{
unifi_trace(card->ospriv, UDBG5, "fh data slot %d: %d\n", i, card->from_host_data[i].bd.data_length);
}
- func_exit();
return CSR_RESULT_FAILURE;
}
}
@@ -3467,8 +3432,6 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue
}
}
- func_exit();
-
return CSR_RESULT_SUCCESS;
} /* CardWriteBulkData() */
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)
if (fwinfo == NULL)
{
unifi_error(card->ospriv, "Failed to allocate memory for patches\n");
- func_exit();
return CSR_WIFI_HIP_RESULT_NO_MEMORY;
}
@@ -427,7 +426,6 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl)
{
kfree(fwinfo);
unifi_error(card->ospriv, "Failed to read in patch file\n");
- func_exit();
return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
}
@@ -442,7 +440,6 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl)
card->build_id, fwinfo->build_id);
kfree(fwinfo);
#ifndef CSR_WIFI_IGNORE_PATCH_VERSION_MISMATCH
- func_exit();
return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
#else
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)
done:
#endif
- func_exit();
return CSR_RESULT_SUCCESS;
#ifndef UNIFI_DISABLE_COREDUMP
@@ -782,7 +781,6 @@ fail:
/* Unwind what we allocated so far */
unifi_error(ospriv, "Out of memory allocating core dump node %d\n", i);
unifi_coredump_free(card);
- func_exit();
return CSR_WIFI_HIP_RESULT_NO_MEMORY;
#endif
} /* unifi_coreump_init() */
@@ -841,8 +839,6 @@ void unifi_coredump_free(card_t *card)
card->dump_buf = NULL;
card->dump_next_write = NULL;
card->dump_cur_read = NULL;
-
- func_exit();
} /* unifi_coredump_free() */
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,
}
}
- func_exit();
-
return CSR_RESULT_SUCCESS;
} /* send_signal() */
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)
priv = uf_get_instance(devno);
if (priv == NULL) {
unifi_error(NULL, "unifi_open: No device present\n");
- func_exit();
return -ENODEV;
}
@@ -288,7 +287,6 @@ unifi_open(struct inode *inode, struct file *file)
/* Too many clients already using this device */
unifi_error(priv, "Too many clients already open\n");
uf_put_instance(devno);
- func_exit();
return -ENOSPC;
}
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)
uf_put_instance(devno);
unifi_info(priv, "There is already a configuration client using the character device\n");
- func_exit();
return -EBUSY;
}
#endif /* CSR_SME_USERSPACE */
@@ -329,7 +326,6 @@ unifi_open(struct inode *inode, struct file *file)
uf_put_instance(devno);
unifi_error(priv, "Too many clients already open\n");
- func_exit();
return -ENOSPC;
}
@@ -355,7 +351,6 @@ unifi_open(struct inode *inode, struct file *file)
*/
file->private_data = udi_cli;
- func_exit();
return 0;
} /* unifi_open() */
@@ -609,7 +604,6 @@ udi_send_signal_unpacked(unifi_priv_t *priv, unsigned char* data, uint data_len)
unifi_net_data_free(priv, &bulk_data.d[i]);
}
}
- func_exit();
return -EIO;
}
@@ -660,7 +654,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen)
if ((signal_size <= 0) || (signal_size > buflen)) {
unifi_error(priv, "udi_send_signal_raw - Couldn't find length of signal 0x%x\n",
sig_id);
- func_exit();
return -EINVAL;
}
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)
if (bytecount > buflen) {
unifi_error(priv, "udi_send_signal_raw: Not enough data (%d instead of %d)\n", buflen, bytecount);
- func_exit();
return -EINVAL;
}
@@ -713,7 +705,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen)
r = ul_send_signal_raw(priv, buf, signal_size, &data_ptrs);
if (r < 0) {
unifi_error(priv, "udi_send_signal_raw: send failed (%d)\n", r);
- func_exit();
return -EIO;
}
@@ -802,7 +793,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff)
csrResult = unifi_net_data_malloc(priv, &bulkdata.d[0], len);
if (csrResult != CSR_RESULT_SUCCESS) {
unifi_error(priv, "unifi_write: failed to allocate request_data.\n");
- func_exit();
return -ENOMEM;
}
@@ -812,7 +802,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff)
if (copy_from_user((void*)user_data_buf, p, len)) {
unifi_error(priv, "unifi_write: copy from user failed\n");
unifi_net_data_free(priv, &bulkdata.d[0]);
- func_exit();
return -EFAULT;
}
@@ -828,7 +817,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff)
unifi_error(priv, "unifi_write - Couldn't find length of signal 0x%x\n",
sig_id);
unifi_net_data_free(priv, &bulkdata.d[0]);
- func_exit();
return -EINVAL;
}
@@ -839,7 +827,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff)
signal_buf = kmalloc(signal_size, GFP_KERNEL);
if (!signal_buf) {
unifi_net_data_free(priv, &bulkdata.d[0]);
- func_exit();
return -ENOMEM;
}
@@ -1655,8 +1642,6 @@ unifi_poll(struct file *filp, poll_table *wait)
mask |= POLLIN | POLLRDNORM; /* readable */
}
- func_exit();
-
return mask;
} /* unifi_poll() */
@@ -1887,7 +1872,6 @@ udi_log_event(ul_client_t *pcli,
if (down_interruptible(&pcli->udi_sem)) {
printk(KERN_WARNING "udi_log_event_q: Failed to get udi sem\n");
kfree(logptr);
- func_exit();
return;
}
list_add_tail(&logptr->q, &pcli->udi_log);
@@ -1896,7 +1880,6 @@ udi_log_event(ul_client_t *pcli,
/* Wake any waiting user process */
wake_up_interruptible(&pcli->udi_wq);
- func_exit();
} /* udi_log_event() */
#ifdef CSR_SME_USERSPACE
@@ -1952,8 +1935,6 @@ uf_sme_queue_message(unifi_priv_t *priv, u8 *buffer, int length)
/* It is our responsibility to free the buffer allocated in build_packed_*() */
kfree(buffer);
- func_exit();
-
return 0;
} /* 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)
}
/* Set up callback struct for readfunc() */
if (priv->fw_sta.dl_data != NULL) {
- func_exit();
return &priv->fw_sta;
}
@@ -78,7 +77,6 @@ unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info)
unifi_error(priv, "downloading firmware... unknown request: %d\n", is_fw);
}
- func_exit();
return NULL;
} /* unifi_fw_read_start() */
@@ -112,7 +110,6 @@ unifi_fw_read_stop(void *ospriv, void *dlpriv)
uf_release_firmware(priv, dl_struct);
}
- func_exit();
} /* unifi_fw_read_stop() */
@@ -142,14 +139,12 @@ unifi_fw_open_buffer(void *ospriv, void *fwbuf, u32 len)
unifi_priv_t *priv = (unifi_priv_t*)ospriv;
if (fwbuf == NULL) {
- func_exit();
return NULL;
}
priv->fw_conv.dl_data = fwbuf;
priv->fw_conv.dl_len = len;
priv->fw_conv.fw_desc = NULL; /* No OS f/w resource is associated */
- func_exit();
return &priv->fw_conv;
}
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)
kfree(priv->rxSignalBuffer.rx_buff[j].bufptr);
priv->rxSignalBuffer.rx_buff[j].bufptr = NULL;
}
- func_exit();
return -1;
}
}
- func_exit();
return 0;
}
@@ -411,7 +409,6 @@ register_unifi_sdio(CsrSdioFunction *sdio_dev, int bus_id, struct device *dev)
up(&Unifi_instance_mutex);
- func_exit();
return priv;
failed4:
@@ -445,7 +442,6 @@ failed0:
up(&Unifi_instance_mutex);
- func_exit();
return NULL;
} /* register_unifi_sdio() */
@@ -481,8 +477,6 @@ ask_unifi_sdio_cleanup(unifi_priv_t *priv)
unifi_trace(NULL, UDBG5, "ask_unifi_sdio_cleanup: wake up cleanup workqueue.\n");
wake_up(&Unifi_cleanup_wq);
- func_exit();
-
} /* ask_unifi_sdio_cleanup() */
@@ -597,8 +591,6 @@ cleanup_unifi_sdio(unifi_priv_t *priv)
unifi_trace(NULL, UDBG5, "cleanup_unifi_sdio: DONE.\n");
- func_exit();
-
} /* cleanup_unifi_sdio() */
@@ -632,7 +624,6 @@ unregister_unifi_sdio(int bus_id)
if (priv == NULL) {
unifi_error(priv, "unregister_unifi_sdio: device %d is not registered\n",
bus_id);
- func_exit();
return;
}
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,
return r;
}
- func_exit();
return 0;
} /* unifi_mlme_blocking_request() */
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,
priv->stats.rx_packets++;
priv->stats.rx_bytes += ind_data_len;
- func_exit();
} /* netrx_radiotap() */
#endif /* RADIOTAP */
@@ -314,7 +313,6 @@ netrx_prism(unifi_priv_t *priv,
priv->stats.rx_packets++;
priv->stats.rx_bytes += ind_data_len;
- func_exit();
} /* netrx_prism() */
#endif /* PRISM */
@@ -348,7 +346,6 @@ ma_sniffdata_ind(void *ospriv,
if (bulkdata->d[0].data_length == 0) {
unifi_warning(priv, "rx: MA-SNIFFDATA indication with zero bulk data\n");
- func_exit();
return;
}
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)
}
}
- func_exit();
return 0;
} /* uf_free_netdevice() */
@@ -610,7 +609,6 @@ uf_net_open(struct net_device *dev)
netif_tx_start_all_queues(dev);
- func_exit();
return 0;
} /* uf_net_open() */
@@ -636,7 +634,6 @@ uf_net_stop(struct net_device *dev)
netif_tx_stop_all_queues(dev);
- func_exit();
return 0;
} /* uf_net_stop() */
@@ -711,7 +708,6 @@ static CSR_PRIORITY uf_get_packet_priority(unifi_priv_t *priv, netInterface_priv
unifi_trace(priv, UDBG5, "Packet priority = %d\n", priority);
- func_exit();
return priority;
}
@@ -776,7 +772,6 @@ get_packet_priority(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr
}
unifi_trace(priv, UDBG5, "priority = %x\n", priority);
- func_exit();
return priority;
}
@@ -822,7 +817,6 @@ uf_net_select_queue(struct net_device *dev, struct sk_buff *skb)
}
- func_exit();
return (u16)queue;
} /* uf_net_select_queue() */
@@ -1789,7 +1783,6 @@ uf_net_xmit(struct sk_buff *skb, struct net_device *dev)
interfacePriv->stats.tx_dropped++;
kfree_skb(skb);
- func_exit();
return NETDEV_TX_OK;
}
@@ -1832,7 +1825,6 @@ uf_net_xmit(struct sk_buff *skb, struct net_device *dev)
/* The skb will have been freed by send_XXX_request() */
- func_exit();
return result;
} /* uf_net_xmit() */
@@ -1880,7 +1872,6 @@ unifi_pause_xmit(void *ospriv, unifi_TrafficQueue queue)
unifi_error(priv, "Start buffering %d defaulting to 0\n", queue);
}
#endif
- func_exit();
} /* unifi_pause_xmit() */
@@ -1909,7 +1900,6 @@ unifi_restart_xmit(void *ospriv, unifi_TrafficQueue queue)
uf_send_buffered_frames(priv,0);
}
#endif
- func_exit();
} /* unifi_restart_xmit() */
@@ -1945,7 +1935,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b
priv->interfacePriv[ifTag]->stats.rx_frame_errors++;
unifi_net_data_free(priv, &bulkdata->d[0]);
unifi_notice(priv, "indicate_rx_skb: Discard unknown frame.\n");
- func_exit();
return;
}
@@ -1957,7 +1946,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b
unifi_net_data_free(priv, &bulkdata->d[0]);
unifi_trace(priv, UDBG5, "indicate_rx_skb: Data given to subscription"
"API, not being given to kernel\n");
- func_exit();
return;
}
@@ -1980,7 +1968,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b
priv->interfacePriv[ifTag]->stats.rx_errors++;
priv->interfacePriv[ifTag]->stats.rx_length_errors++;
unifi_net_data_free(priv, &bulkdata->d[0]);
- func_exit();
return;
}
@@ -2007,7 +1994,6 @@ indicate_rx_skb(unifi_priv_t *priv, u16 ifTag, u8* dst_a, u8* src_a, struct sk_b
priv->interfacePriv[ifTag]->stats.rx_packets++;
priv->interfacePriv[ifTag]->stats.rx_bytes += bulkdata->d[0].data_length;
- func_exit();
return;
}
@@ -2168,7 +2154,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
{
unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag);
unifi_net_data_free(priv,&bulkdata->d[0]);
- func_exit();
return;
}
@@ -2177,14 +2162,12 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
{
unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __FUNCTION__, interfaceTag);
unifi_net_data_free(priv, &bulkdata->d[0]);
- func_exit();
return;
}
if (bulkdata->d[0].data_length == 0) {
unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __FUNCTION__);
unifi_net_data_free(priv,&bulkdata->d[0]);
- func_exit();
return;
}
@@ -2306,7 +2289,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]);
CsrWifiRouterCtrlUnexpectedFrameIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,interfaceTag,peerMacAddress);
unifi_net_data_free(priv, &bulkdata->d[0]);
- func_exit();
return;
}
@@ -2323,7 +2305,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
unifi_net_data_free(priv, &bulkdata->d[0]);
unifi_notice(priv, "%s: Dropping packet, proto=0x%04x, %s port\n", __FUNCTION__,
proto, queue ? "Controlled" : "Un-controlled");
- func_exit();
return;
}
@@ -2331,7 +2312,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
if((dataFrameType == QOS_DATA_NULL) || (dataFrameType == DATA_NULL)){
unifi_trace(priv, UDBG5, "%s: Null Frame Received and Freed\n", __FUNCTION__);
unifi_net_data_free(priv, &bulkdata->d[0]);
- func_exit();
return;
}
@@ -2346,7 +2326,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
bulkdata,
macHeaderLengthInBytes)))
{
- func_exit();
return;
}
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)
unifi_trace(priv, UDBG1, "Zero length frame, but not null-data %04x\n", frameControl);
}
unifi_net_data_free(priv, &bulkdata->d[0]);
- func_exit();
return;
}
@@ -2379,7 +2357,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
unifi_net_data_free(priv, &bulkdata->d[0]);
unifi_notice(priv, "%s: Dropping packet, proto=0x%04x, %s port\n",
__FUNCTION__, proto, queue ? "controlled" : "uncontrolled");
- func_exit();
return;
} else if ( (port_action == CSR_WIFI_ROUTER_CTRL_PORT_ACTION_8021X_PORT_CLOSED_BLOCK) ||
(interfacePriv->connected != UnifiConnected) ) {
@@ -2395,7 +2372,6 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
__FUNCTION__, sizeof(rx_buffered_packets_t));
interfacePriv->stats.rx_dropped++;
unifi_net_data_free(priv, &bulkdata->d[0]);
- func_exit();
return;
}
@@ -2419,15 +2395,12 @@ unifi_rx(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_data_param_t *bulkdata)
list_add_tail(&rx_q_item->q, rx_list);
up(&priv->rx_q_sem);
- func_exit();
return;
}
indicate_rx_skb(priv, interfaceTag, da, sa, skb, signal, bulkdata);
- func_exit();
-
} /* unifi_rx() */
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
if (interfaceTag >= CSR_WIFI_NUM_INTERFACES)
{
unifi_error(priv, "%s: MA-PACKET confirm with bad interfaceTag %d\n", __FUNCTION__, interfaceTag);
- func_exit();
return;
}
#ifdef CSR_SUPPORT_SME
@@ -2466,7 +2438,6 @@ static void process_ma_packet_cfm(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
interfacePriv->m4_hostTag = 0xffffffff;
}
#endif
- func_exit();
return;
}
@@ -2516,7 +2487,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
{
unifi_error(priv, "%s: MA-PACKET indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag);
unifi_net_data_free(priv,&bulkdata->d[0]);
- func_exit();
return;
}
@@ -2525,14 +2495,12 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
{
unifi_error(priv, "%s: MA-PACKET indication with unallocated interfaceTag %d\n", __FUNCTION__, interfaceTag);
unifi_net_data_free(priv, &bulkdata->d[0]);
- func_exit();
return;
}
if (bulkdata->d[0].data_length == 0) {
unifi_warning(priv, "%s: MA-PACKET indication with zero bulk data\n", __FUNCTION__);
unifi_net_data_free(priv,&bulkdata->d[0]);
- func_exit();
return;
}
/* 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
{
unifi_warning(priv, "%s: MA-PACKET indication with status = %d\n",__FUNCTION__, pkt_ind->ReceptionStatus);
unifi_net_data_free(priv,&bulkdata->d[0]);
- func_exit();
return;
}
@@ -2590,13 +2557,11 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
}
#endif
unifi_net_data_free(priv,&bulkdata->d[0]);
- func_exit();
return;
}
if(frameType != IEEE802_11_FRAMETYPE_DATA) {
unifi_warning(priv, "%s: Non control Non Data frame is received\n",__FUNCTION__);
unifi_net_data_free(priv,&bulkdata->d[0]);
- func_exit();
return;
}
@@ -2614,7 +2579,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
sa[0], sa[1],sa[2], sa[3], sa[4],sa[5]);
CsrWifiRouterCtrlUnexpectedFrameIndSend(priv->CSR_WIFI_SME_IFACEQUEUE,0,interfaceTag,peerMacAddress);
unifi_net_data_free(priv, &bulkdata->d[0]);
- func_exit();
return;
}
@@ -2720,7 +2684,6 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
up(&priv->ba_mutex);
process_ba_complete(priv, interfacePriv);
- func_exit();
}
/*
* ---------------------------------------------------------------------------
@@ -2877,7 +2840,6 @@ netdev_mlme_event_handler(ul_client_t *pcli, const u8 *sig_packed, int sig_len,
break;
}
- func_exit();
} /* netdev_mlme_event_handler() */
@@ -3313,7 +3275,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal,
if (interfaceTag >= CSR_WIFI_NUM_INTERFACES)
{
unifi_error(priv, "%s: MaPacketErrorIndication indication with bad interfaceTag %d\n", __FUNCTION__, interfaceTag);
- func_exit();
return;
}
@@ -3321,7 +3282,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal,
UserPriority = pkt_err_ind->UserPriority;
if(UserPriority > 15) {
unifi_error(priv, "%s: MaPacketErrorIndication indication with bad UserPriority=%d\n", __FUNCTION__, UserPriority);
- func_exit();
}
sn = pkt_err_ind->SequenceNumber;
@@ -3342,7 +3302,6 @@ static void process_ma_packet_error_ind(unifi_priv_t *priv, CSR_SIGNAL *signal,
up(&priv->ba_mutex);
process_ba_complete(priv, interfacePriv);
- func_exit();
}
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)
#endif
_sdio_release_host(func);
- func_exit();
if (err) {
printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err);
return ConvertSdioToCsrSdioResult(err);
@@ -506,7 +505,6 @@ CsrSdioInterruptDisable(CsrSdioFunction *function)
#endif
_sdio_release_host(func);
- func_exit();
if (err) {
printk(KERN_ERR "unifi: %s: error %d writing IENx\n", __FUNCTION__, err);
return ConvertSdioToCsrSdioResult(err);
@@ -548,7 +546,6 @@ CsrSdioFunctionEnable(CsrSdioFunction *function)
unifi_error(NULL, "Failed to enable SDIO function %d\n", func->num);
}
- func_exit();
return ConvertSdioToCsrSdioResult(err);
} /* CsrSdioFunctionEnable() */
@@ -580,7 +577,6 @@ CsrSdioFunctionDisable(CsrSdioFunction *function)
unifi_error(NULL, "Failed to disable SDIO function %d\n", func->num);
}
- func_exit();
return ConvertSdioToCsrSdioResult(err);
} /* CsrSdioFunctionDisable() */
@@ -1096,7 +1092,6 @@ uf_glue_sdio_probe(struct sdio_func *func,
wake_lock(&unifi_sdio_wake_lock);
#endif
- func_exit();
return 0;
} /* uf_glue_sdio_probe() */
@@ -1139,8 +1134,6 @@ uf_glue_sdio_remove(struct sdio_func *func)
kfree(sdio_ctx);
- func_exit();
-
} /* uf_glue_sdio_remove */
@@ -1176,7 +1169,6 @@ uf_glue_sdio_suspend(struct device *dev)
{
unifi_trace(NULL, UDBG1, "uf_glue_sdio_suspend");
- func_exit();
return 0;
} /* uf_glue_sdio_suspend */
@@ -1204,7 +1196,6 @@ uf_glue_sdio_resume(struct device *dev)
wake_lock(&unifi_sdio_wake_lock);
#endif
- func_exit();
return 0;
} /* 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)
{
int r = uf_init_wext_interface(priv);
if (r != 0) {
- func_exit();
return r;
}
}
#endif
-
-
- func_exit();
return 0;
} /* uf_sme_init() */
@@ -54,8 +50,6 @@ uf_sme_deinit(unifi_priv_t *priv)
uf_deinit_wext_interface(priv);
#endif
-
- func_exit();
} /* uf_sme_deinit() */
@@ -327,8 +321,6 @@ sme_native_log_event(ul_client_t *pcli,
/* Wake any waiting user process */
wake_up_interruptible(&client->udi_wq);
- func_exit();
-
} /* sme_native_log_event() */
@@ -533,7 +525,6 @@ sme_native_mlme_event_handler(ul_client_t *pcli,
break;
}
- func_exit();
} /* sme_native_mlme_event_handler() */
@@ -570,7 +561,6 @@ unifi_reset_state(unifi_priv_t *priv, unsigned char *macaddr,
priv->wext_conf.flag_associated = 0;
#endif
- func_exit();
return r;
} /* unifi_reset_state() */
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)
return;
}
- func_exit();
-
}
#endif /* CSR_WIFI_SEND_GRATUITOUS_ARP */
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,
~(CSR_WIFI_SME_ENCRYPTION_CIPHER_PAIRWISE_SMS4 | CSR_WIFI_SME_ENCRYPTION_CIPHER_GROUP_SMS4);
}
- func_exit();
return 0;
}
@@ -880,7 +879,6 @@ iwprivswpikey(struct net_device *dev, struct iw_request_info *info,
return convert_sme_error(r);
}
- func_exit();
return r;
}
#endif
@@ -932,7 +930,6 @@ unifi_siwfreq(struct net_device *dev, struct iw_request_info *info,
priv->connection_config.adhocChannel = wext_freq_to_channel(freq->m, freq->e);
}
- func_exit();
return 0;
} /* unifi_siwfreq() */
@@ -966,7 +963,6 @@ unifi_giwfreq(struct net_device *dev, struct iw_request_info *info,
(connectionInfo.networkType80211 == CSR_WIFI_SME_RADIO_IF_GHZ_5_0));
freq->e = 6;
- func_exit();
return convert_sme_error(err);
} /* unifi_giwfreq() */
@@ -1006,7 +1002,6 @@ unifi_siwmode(struct net_device *dev, struct iw_request_info *info,
priv->connection_config.ssid.length = 0;
memset(priv->connection_config.bssid.a, 0xFF, ETH_ALEN);
- func_exit();
return 0;
} /* unifi_siwmode() */
@@ -1063,7 +1058,6 @@ unifi_giwmode(struct net_device *dev, struct iw_request_info *info,
}
unifi_trace(priv, UDBG4, "unifi_giwmode: mode = 0x%x\n", wrqu->mode);
- func_exit();
return r;
} /* unifi_giwmode() */
@@ -1227,11 +1221,9 @@ unifi_siwap(struct net_device *dev, struct iw_request_info *info,
err = sme_mgt_connect(priv);
if (err) {
unifi_error(priv, "unifi_siwap: Join failed, status %d\n", err);
- func_exit();
return convert_sme_error(err);
}
}
- func_exit();
return 0;
} /* unifi_siwap() */
@@ -1271,7 +1263,6 @@ unifi_giwap(struct net_device *dev, struct iw_request_info *info,
memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
}
- func_exit();
return 0;
} /* unifi_giwap() */
@@ -1354,7 +1345,6 @@ unifi_siwscan(struct net_device *dev, struct iw_request_info *info,
kfree(channel_list);
}
- func_exit();
return r;
} /* unifi_siwscan() */
@@ -1747,11 +1737,9 @@ unifi_siwessid(struct net_device *dev, struct iw_request_info *info,
UF_RTNL_LOCK();
if (err) {
unifi_error(priv, "unifi_siwessid: Join failed, status %d\n", err);
- func_exit();
return convert_sme_error(err);
}
- func_exit();
return 0;
} /* unifi_siwessid() */
@@ -1791,7 +1779,6 @@ unifi_giwessid(struct net_device *dev, struct iw_request_info *info,
data->length, essid);
}
- func_exit();
return 0;
} /* unifi_giwessid() */
@@ -1847,7 +1834,6 @@ unifi_siwrate(struct net_device *dev, struct iw_request_info *info,
return r;
}
- func_exit();
return 0;
} /* unifi_siwrate() */
@@ -1896,8 +1882,6 @@ unifi_giwrate(struct net_device *dev, struct iw_request_info *info,
args->value = bitrate * 500000;
args->fixed = !flag;
- func_exit();
-
return 0;
} /* unifi_giwrate() */
@@ -2473,7 +2457,6 @@ unifi_siwmlme(struct net_device *dev, struct iw_request_info *info,
return -EOPNOTSUPP;
}
- func_exit();
return 0;
} /* unifi_siwmlme() */
@@ -2528,20 +2511,17 @@ unifi_siwgenie(struct net_device *dev, struct iw_request_info *info,
len = wrqu->data.length;
if (len == 0) {
- func_exit();
return 0;
}
priv->connection_config.mlmeAssociateReqInformationElements = kmalloc(len, GFP_KERNEL);
if (priv->connection_config.mlmeAssociateReqInformationElements == NULL) {
- func_exit();
return -ENOMEM;
}
priv->connection_config.mlmeAssociateReqInformationElementsLength = len;
memcpy( priv->connection_config.mlmeAssociateReqInformationElements, extra, len);
- func_exit();
return 0;
} /* unifi_siwgenie() */
@@ -2578,7 +2558,6 @@ unifi_giwgenie(struct net_device *dev, struct iw_request_info *info,
wrqu->data.length = len;
memcpy(extra, priv->connection_config.mlmeAssociateReqInformationElements, len);
- func_exit();
return 0;
} /* unifi_giwgenie() */
@@ -2826,7 +2805,6 @@ _unifi_siwauth(struct net_device *dev, struct iw_request_info *info,
}
unifi_trace(priv, UDBG2, "authModeMask = %d", priv->connection_config.authModeMask);
- func_exit();
return 0;
} /* _unifi_siwauth() */
@@ -3037,7 +3015,6 @@ _unifi_siwencodeext(struct net_device *dev, struct iw_request_info *info,
return convert_sme_error(r);
}
- func_exit();
return r;
} /* _unifi_siwencodeext() */
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,
unifi_net_data_free(priv, (void *)&bulkdata->d[i]);
}
}
- func_exit();
return;
}
} /* CSR_MA_PACKET_INDICATION_ID */
@@ -571,7 +570,6 @@ unifi_process_receive_event(void *ospriv,
}
}
- func_exit();
} /* unifi_process_receive_event() */
@@ -602,7 +600,6 @@ void unifi_rx_queue_flush(void *ospriv)
}
priv->rxSignalBuffer.readPointer = readPointer;
}
- func_exit();
}
void rx_wq_handler(struct work_struct *work)
@@ -691,6 +688,5 @@ unifi_receive_event(void *ospriv,
#else
unifi_process_receive_event(ospriv, sigdata, siglen, bulkdata);
#endif
- func_exit();
} /* unifi_receive_event() */
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;
* etc.
*/
-#define func_exit() \
- do { \
- if (unifi_debug >= 5) { \
- printk("unifi: <= %s\n", __FUNCTION__); \
- } \
- } while (0)
#define func_exit_r(_rc) \
do { \
if (unifi_debug >= 5) { \
@@ -101,7 +95,6 @@ void unifi_trace(void* ospriv, int level, const char *fmt, ...);
#else
/* Stubs */
-#define func_exit()
#define func_exit_r(_rc)
#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,
unifi_error(priv,
"Failed to allocate %d bytes for tx packet record\n",
sizeof(tx_buffered_packets_t));
- func_exit();
return CSR_RESULT_FAILURE;
}
@@ -2131,7 +2130,6 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata,
unifi_error(priv,
"uf_process_ma_vif_availibility_ind: Received unknown signal 0x%.4X.\n",
CSR_GET_UINT16_FROM_LITTLE_ENDIAN(sigdata));
- func_exit();
return;
}
ind = &signal.u.MaVifAvailabilityIndication;
@@ -2394,8 +2392,6 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv,
}
}
- func_exit();
-
}
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)
interfacePriv->dtimActive = FALSE;
}
}
- func_exit();
return;
}
if(priv->pausedStaHandle[queue] > 7) {
@@ -2536,7 +2531,6 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q)
*/
unifi_trace(priv, UDBG4, "csrWifiHipSendBufferedFrames: UAPSD Resume Q=%x\n", queue);
resume_suspended_uapsd(priv, interfaceTag);
- func_exit();
}
@@ -2816,7 +2810,6 @@ void uf_send_qos_null(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI
unifi_net_data_free(priv, &bulkdata.d[0]);
}
- func_exit();
return;
}
@@ -2901,7 +2894,6 @@ void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI
srcStaInfo->nullDataHostTag = INVALID_HOST_TAG;
}
- func_exit();
return;
}
@@ -3347,7 +3339,6 @@ void uf_prepare_send_cfm_list_for_queued_pkts(unifi_priv_t * priv,
spin_unlock_irqrestore(&priv->tx_q_lock,lock_flags);
- func_exit();
}
@@ -3661,7 +3652,6 @@ void resume_unicast_buffered_frames(unifi_priv_t *priv, u16 interfaceTag)
}
}
}
- func_exit();
}
void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interfaceTag)
{
@@ -3688,7 +3678,6 @@ void update_eosp_to_head_of_broadcast_list_head(unifi_priv_t *priv,u16 interface
}
spin_unlock_irqrestore(&priv->tx_q_lock,lock_flags);
}
- func_exit();
}
/*
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,
/* Just a sanity check */
if ((signal == NULL) || (signal_len <= 0)) {
- func_exit();
return;
}
priv = uf_find_instance(pcli->instance);
if (!priv) {
unifi_error(priv, "sme_log_event: invalid priv\n");
- func_exit();
return;
}
if (priv->smepriv == NULL) {
unifi_error(priv, "sme_log_event: invalid smepriv\n");
- func_exit();
return;
}
@@ -108,7 +105,6 @@ sme_log_event(ul_client_t *pcli,
if ((unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_DEBUG_STRING_INDICATION_ID) ||
(unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_DEBUG_WORD16_INDICATION_ID))
{
- func_exit();
return;
}
if (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_MA_PACKET_INDICATION_ID)
@@ -170,7 +166,6 @@ sme_log_event(ul_client_t *pcli,
if (interfaceTag >= CSR_WIFI_NUM_INTERFACES)
{
unifi_error(priv, "Bad MA_PACKET_CONFIRM interfaceTag %d\n", interfaceTag);
- func_exit();
return;
}
@@ -218,7 +213,6 @@ sme_log_event(ul_client_t *pcli,
} else {
unifi_trace(priv, UDBG1, "%s: M4 received from netdevice\n", __FUNCTION__);
}
- func_exit();
return;
}
}
@@ -247,7 +241,6 @@ sme_log_event(ul_client_t *pcli,
dataref1.length, dataref1.data,
dataref2.length, dataref2.data);
- func_exit();
} /* sme_log_event() */
@@ -1168,8 +1161,6 @@ uf_send_m4_ready_wq(struct work_struct *work)
unifi_trace(priv, UDBG1, "M4ReadyToSendInd sent for peer %pMF\n",
peer.a);
- func_exit();
-
} /* uf_send_m4_ready_wq() */
#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)
kfree(pktBulkData); /* Would have been copied over by the SME Handler */
- func_exit();
} else {
unifi_warning(priv, "uf_send_pkt_to_encrypt() is NOT applicable for interface mode - %d\n",interfacePriv->interfaceMode);
}