Skip to content

Commit

Permalink
staging: csr: remove func_exit macro
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Devendra Naga authored and Greg Kroah-Hartman committed Oct 29, 2012
1 parent 438d2d1 commit 75254af
Show file tree
Hide file tree
Showing 18 changed files with 0 additions and 200 deletions.
37 changes: 0 additions & 37 deletions drivers/staging/csr/csr_wifi_hip_card_sdio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ card_t* unifi_alloc_card(CsrSdioFunction *sdio, void *ospriv)
}
}
#endif
func_exit();
return card;
} /* unifi_alloc_card() */

Expand Down Expand Up @@ -196,7 +195,6 @@ CsrResult unifi_init_card(card_t *card, s32 led_mask)
return r;
}

func_exit();
return CSR_RESULT_SUCCESS;
}

Expand Down Expand Up @@ -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() */

Expand Down Expand Up @@ -474,8 +470,6 @@ static CsrResult unifi_hip_init(card_t *card)
return r;
}

func_exit();

return CSR_RESULT_SUCCESS;
} /* unifi_hip_init() */

Expand Down Expand Up @@ -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() */

Expand Down Expand Up @@ -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() */

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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() */

Expand Down Expand Up @@ -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() */

Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -1562,7 +1549,6 @@ void unifi_read_panic(card_t *card)
card->last_mac_panic_arg = p_arg;
}

func_exit();
}


Expand Down Expand Up @@ -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() */

Expand Down Expand Up @@ -1787,7 +1772,6 @@ static void card_free_memory_resources(card_t *card)

card->memory_resources_allocated = 0;

func_exit();
} /* card_free_memory_resources() */


Expand All @@ -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();
}


Expand Down Expand Up @@ -1899,7 +1882,6 @@ void unifi_cancel_pending_signals(card_t *card)

card_init_soft_queues(card);

func_exit();
} /* unifi_cancel_pending_signals() */


Expand Down Expand Up @@ -1938,7 +1920,6 @@ void unifi_free_card(card_t *card)

kfree(card);

func_exit();
} /* unifi_free_card() */


Expand Down Expand Up @@ -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() */

Expand Down Expand Up @@ -2143,7 +2123,6 @@ static void CardReassignDynamicReservation(card_t *card)
}

card->dynamic_slot_data.total_packets_txed = 0;
func_exit();
}


Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -2278,7 +2256,6 @@ static void CardCheckDynamicReservation(card_t *card, unifi_TrafficQueue queue)
card->dynamic_slot_data.from_host_max_slots[i]);
}

func_exit();
}


Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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() */


Expand Down Expand Up @@ -2430,7 +2405,6 @@ u16 CardGetFreeFromHostDataSlots(card_t *card)
}
}

func_exit();
return n;
} /* CardGetFreeFromHostDataSlots() */

Expand Down Expand Up @@ -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() */

Expand Down Expand Up @@ -2572,7 +2545,6 @@ static CsrResult unifi_prepare_hw(card_t *card)
return r;
}

func_exit();
return CSR_RESULT_SUCCESS;
} /* unifi_prepare_hw() */

Expand Down Expand Up @@ -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() */

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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() */

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -3006,7 +2974,6 @@ CsrResult unifi_card_hard_reset(card_t *card)
}
if (r == CSR_RESULT_SUCCESS)
{
func_exit();
return r;
}
}
Expand Down Expand Up @@ -3069,7 +3036,6 @@ CsrResult CardGenInt(card_t *card)

card->unifi_interrupt_seq++;

func_exit();
return CSR_RESULT_SUCCESS;
} /* CardGenInt() */

Expand Down Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -3467,8 +3432,6 @@ CsrResult CardWriteBulkData(card_t *card, card_signal_t *csptr, unifi_TrafficQue
}
}

func_exit();

return CSR_RESULT_SUCCESS;
} /* CardWriteBulkData() */

Expand Down
3 changes: 0 additions & 3 deletions drivers/staging/csr/csr_wifi_hip_download.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand All @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions drivers/staging/csr/csr_wifi_hip_dump.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -774,15 +774,13 @@ CsrResult unifi_coredump_init(card_t *card, u16 num_dump_buffers)

done:
#endif
func_exit();
return CSR_RESULT_SUCCESS;

#ifndef UNIFI_DISABLE_COREDUMP
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() */
Expand Down Expand Up @@ -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() */


2 changes: 0 additions & 2 deletions drivers/staging/csr/csr_wifi_hip_send.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,6 @@ static CsrResult send_signal(card_t *card, const u8 *sigptr, u32 siglen,
}
}

func_exit();

return CSR_RESULT_SUCCESS;
} /* send_signal() */

Expand Down
Loading

0 comments on commit 75254af

Please sign in to comment.