Skip to content

L
linux
Commit 1f5466b0 authored by Devendra Naga's avatar Devendra Naga Committed by Greg Kroah-Hartman
Browse files
Options

staging: csr: remove func_exit_r macro 

this macro is used for debugging purposes,

it actually defined as

if (unifi_debug >= 5) {
	printk("unifi: <= %s %d\n", __FUNCTION__, (int)rc);
}

which produces too many of those prints if the unifi_debug is >=5.
remove these calls and the macro itself altogether
Signed-off-by: default avatarDevendra Naga <devendra.aaru@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 75254af8
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 109 deletions
drivers/staging/csr/csr_wifi_hip_card_sdio.c
View file @ 1f5466b0
...@@ -171,27 +171,23 @@ CsrResult unifi_init_card(card_t *card, s32 led_mask) ...@@ -171,27 +171,23 @@ CsrResult unifi_init_card(card_t *card, s32 led_mask)
if (card == NULL) if (card == NULL)
{ {
func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE);
return CSR_WIFI_HIP_RESULT_INVALID_VALUE; return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
} }
r = unifi_init(card); r = unifi_init(card);
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
func_exit_r(r);
return r; return r;
} }
r = unifi_hip_init(card); r = unifi_hip_init(card);
if (r == CSR_WIFI_HIP_RESULT_NO_DEVICE) if (r == CSR_WIFI_HIP_RESULT_NO_DEVICE)
{ {
func_exit_r(r);
return r; return r;
} }
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to start host protocol.\n"); unifi_error(card->ospriv, "Failed to start host protocol.\n");
func_exit_r(r);
return r; return r;
} }
...@@ -220,7 +216,6 @@ CsrResult unifi_init(card_t *card) ...@@ -220,7 +216,6 @@ CsrResult unifi_init(card_t *card)
if (card == NULL) if (card == NULL)
{ {
func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE);
return CSR_WIFI_HIP_RESULT_INVALID_VALUE; return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
} }
...@@ -243,7 +238,6 @@ CsrResult unifi_init(card_t *card) ...@@ -243,7 +238,6 @@ CsrResult unifi_init(card_t *card)
if (csrResult != CSR_RESULT_SUCCESS) if (csrResult != CSR_RESULT_SUCCESS)
{ {
r = ConvertCsrSdioToCsrHipResult(card, csrResult); r = ConvertCsrSdioToCsrHipResult(card, csrResult);
func_exit_r(r);
return r; return r;
} }
card->sdio_clock_speed = UNIFI_SDIO_CLOCK_SAFE_HZ; card->sdio_clock_speed = UNIFI_SDIO_CLOCK_SAFE_HZ;
...@@ -261,7 +255,6 @@ CsrResult unifi_init(card_t *card) ...@@ -261,7 +255,6 @@ CsrResult unifi_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to reset UniFi\n"); unifi_error(card->ospriv, "Failed to reset UniFi\n");
func_exit_r(r);
return r; return r;
} }
...@@ -271,7 +264,6 @@ CsrResult unifi_init(card_t *card) ...@@ -271,7 +264,6 @@ CsrResult unifi_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to set power save mode\n"); unifi_error(card->ospriv, "Failed to set power save mode\n");
func_exit_r(r);
return r; return r;
} }
...@@ -291,7 +283,6 @@ CsrResult unifi_init(card_t *card) ...@@ -291,7 +283,6 @@ CsrResult unifi_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to write SHARED_DMEM_PAGE\n"); unifi_error(card->ospriv, "Failed to write SHARED_DMEM_PAGE\n");
func_exit_r(r);
return r; return r;
} }
r = unifi_write_direct16(card, ChipHelper_HOST_WINDOW2_PAGE(card->helper) * 2, 0); r = unifi_write_direct16(card, ChipHelper_HOST_WINDOW2_PAGE(card->helper) * 2, 0);
...@@ -302,7 +293,6 @@ CsrResult unifi_init(card_t *card) ...@@ -302,7 +293,6 @@ CsrResult unifi_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to write PROG_MEM2_PAGE\n"); unifi_error(card->ospriv, "Failed to write PROG_MEM2_PAGE\n");
func_exit_r(r);
return r; return r;
} }
...@@ -331,7 +321,6 @@ CsrResult unifi_init(card_t *card) ...@@ -331,7 +321,6 @@ CsrResult unifi_init(card_t *card)
unifi_error(card->ospriv, "Probe for Flash failed\n"); unifi_error(card->ospriv, "Probe for Flash failed\n");
} }
func_exit_r(r);
return r; return r;
} /* unifi_init() */ } /* unifi_init() */
...@@ -358,7 +347,6 @@ CsrResult unifi_download(card_t *card, s32 led_mask) ...@@ -358,7 +347,6 @@ CsrResult unifi_download(card_t *card, s32 led_mask)
if (card == NULL) if (card == NULL)
{ {
func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE);
return CSR_WIFI_HIP_RESULT_INVALID_VALUE; return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
} }
...@@ -371,7 +359,6 @@ CsrResult unifi_download(card_t *card, s32 led_mask) ...@@ -371,7 +359,6 @@ CsrResult unifi_download(card_t *card, s32 led_mask)
dlpriv = unifi_dl_fw_read_start(card, UNIFI_FW_STA); dlpriv = unifi_dl_fw_read_start(card, UNIFI_FW_STA);
if (dlpriv == NULL) if (dlpriv == NULL)
{ {
func_exit_r(CSR_WIFI_HIP_RESULT_NOT_FOUND);
return CSR_WIFI_HIP_RESULT_NOT_FOUND; return CSR_WIFI_HIP_RESULT_NOT_FOUND;
} }
...@@ -380,7 +367,6 @@ CsrResult unifi_download(card_t *card, s32 led_mask) ...@@ -380,7 +367,6 @@ CsrResult unifi_download(card_t *card, s32 led_mask)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to download firmware\n"); unifi_error(card->ospriv, "Failed to download firmware\n");
func_exit_r(r);
return r; return r;
} }
...@@ -422,7 +408,6 @@ static CsrResult unifi_hip_init(card_t *card) ...@@ -422,7 +408,6 @@ static CsrResult unifi_hip_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to establish communication with UniFi\n"); unifi_error(card->ospriv, "Failed to establish communication with UniFi\n");
func_exit_r(r);
return r; return r;
} }
#ifdef CSR_PRE_ALLOC_NET_DATA #ifdef CSR_PRE_ALLOC_NET_DATA
...@@ -442,7 +427,6 @@ static CsrResult unifi_hip_init(card_t *card) ...@@ -442,7 +427,6 @@ static CsrResult unifi_hip_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Init slots failed: %d\n", r); unifi_error(card->ospriv, "Init slots failed: %d\n", r);
func_exit_r(r);
return r; return r;
} }
...@@ -451,7 +435,6 @@ static CsrResult unifi_hip_init(card_t *card) ...@@ -451,7 +435,6 @@ static CsrResult unifi_hip_init(card_t *card)
r = unifi_set_host_state(card, UNIFI_HOST_STATE_AWAKE); r = unifi_set_host_state(card, UNIFI_HOST_STATE_AWAKE);
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
func_exit_r(r);
return r; return r;
} }
...@@ -466,7 +449,6 @@ static CsrResult unifi_hip_init(card_t *card) ...@@ -466,7 +449,6 @@ static CsrResult unifi_hip_init(card_t *card)
r = CardGenInt(card); r = CardGenInt(card);
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
func_exit_r(r);
return r; return r;
} }
...@@ -618,7 +600,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -618,7 +600,6 @@ static CsrResult card_hw_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Firmware hasn't started\n"); unifi_error(card->ospriv, "Firmware hasn't started\n");
func_exit_r(r);
return r; return r;
} }
unifi_trace(card->ospriv, UDBG4, "SLUT addr 0x%lX\n", slut_address); unifi_trace(card->ospriv, UDBG4, "SLUT addr 0x%lX\n", slut_address);
...@@ -635,7 +616,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -635,7 +616,6 @@ static CsrResult card_hw_init(card_t *card)
if (csrResult != CSR_RESULT_SUCCESS) if (csrResult != CSR_RESULT_SUCCESS)
{ {
r = ConvertCsrSdioToCsrHipResult(card, csrResult); r = ConvertCsrSdioToCsrHipResult(card, csrResult);
func_exit_r(r);
return r; return r;
} }
card->sdio_clock_speed = UNIFI_SDIO_CLOCK_INIT_HZ; card->sdio_clock_speed = UNIFI_SDIO_CLOCK_INIT_HZ;
...@@ -654,14 +634,12 @@ static CsrResult card_hw_init(card_t *card) ...@@ -654,14 +634,12 @@ static CsrResult card_hw_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to read SLUT finger print\n"); unifi_error(card->ospriv, "Failed to read SLUT finger print\n");
func_exit_r(r);
return r; return r;
} }
if (finger_print != SLUT_FINGERPRINT) if (finger_print != SLUT_FINGERPRINT)
{ {
unifi_error(card->ospriv, "Failed to find Symbol lookup table fingerprint\n"); unifi_error(card->ospriv, "Failed to find Symbol lookup table fingerprint\n");
func_exit_r(CSR_RESULT_FAILURE);
return CSR_RESULT_FAILURE; return CSR_RESULT_FAILURE;
} }
...@@ -679,7 +657,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -679,7 +657,6 @@ static CsrResult card_hw_init(card_t *card)
r = unifi_card_read16(card, slut_address, &s); r = unifi_card_read16(card, slut_address, &s);
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
func_exit_r(r);
return r; return r;
} }
slut_address += 2; slut_address += 2;
...@@ -693,7 +670,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -693,7 +670,6 @@ static CsrResult card_hw_init(card_t *card)
r = unifi_read32(card, slut_address, &l); r = unifi_read32(card, slut_address, &l);
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
func_exit_r(r);
return r; return r;
} }
slut_address += 4; slut_address += 4;
...@@ -722,7 +698,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -722,7 +698,6 @@ static CsrResult card_hw_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to read config data\n"); unifi_error(card->ospriv, "Failed to read config data\n");
func_exit_r(r);
return r; return r;
} }
/* .. and then we copy the data to the host structure */ /* .. and then we copy the data to the host structure */
...@@ -736,7 +711,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -736,7 +711,6 @@ static CsrResult card_hw_init(card_t *card)
{ {
unifi_error(card->ospriv, "From host data slots %d\n", cfg_data->num_fromhost_data_slots); unifi_error(card->ospriv, "From host data slots %d\n", cfg_data->num_fromhost_data_slots);
unifi_error(card->ospriv, "need to be (queues * x + 2) (UNIFI_RESERVED_COMMAND_SLOTS for commands)\n"); unifi_error(card->ospriv, "need to be (queues * x + 2) (UNIFI_RESERVED_COMMAND_SLOTS for commands)\n");
func_exit_r(CSR_RESULT_FAILURE);
return CSR_RESULT_FAILURE; return CSR_RESULT_FAILURE;
} }
...@@ -764,7 +738,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -764,7 +738,6 @@ static CsrResult card_hw_init(card_t *card)
if ((card->sdio_io_block_size % cfg_data->sig_frag_size) != 0) if ((card->sdio_io_block_size % cfg_data->sig_frag_size) != 0)
{ {
unifi_error(card->ospriv, "Configuration error: Can not pad to-host signals.\n"); unifi_error(card->ospriv, "Configuration error: Can not pad to-host signals.\n");
func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE);
return CSR_WIFI_HIP_RESULT_INVALID_VALUE; return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
} }
cfg_data->tohost_signal_padding = (u16) (card->sdio_io_block_size / cfg_data->sig_frag_size); cfg_data->tohost_signal_padding = (u16) (card->sdio_io_block_size / cfg_data->sig_frag_size);
...@@ -778,7 +751,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -778,7 +751,6 @@ static CsrResult card_hw_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to write To-Host Signal Padding Fragments\n"); unifi_error(card->ospriv, "Failed to write To-Host Signal Padding Fragments\n");
func_exit_r(r);
return r; return r;
} }
} }
...@@ -801,7 +773,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -801,7 +773,6 @@ static CsrResult card_hw_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to read build id\n"); unifi_error(card->ospriv, "Failed to read build id\n");
func_exit_r(r);
return r; return r;
} }
card->build_id = n; card->build_id = n;
...@@ -818,7 +789,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -818,7 +789,6 @@ static CsrResult card_hw_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to read build string\n"); unifi_error(card->ospriv, "Failed to read build string\n");
func_exit_r(r);
return r; return r;
} }
break; break;
...@@ -836,7 +806,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -836,7 +806,6 @@ static CsrResult card_hw_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to write loader load image command\n"); unifi_error(card->ospriv, "Failed to write loader load image command\n");
func_exit_r(r);
return r; return r;
} }
...@@ -854,7 +823,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -854,7 +823,6 @@ static CsrResult card_hw_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to patch firmware\n"); unifi_error(card->ospriv, "Failed to patch firmware\n");
func_exit_r(r);
return r; return r;
} }
} }
...@@ -865,7 +833,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -865,7 +833,6 @@ static CsrResult card_hw_init(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to write loader restart command\n"); unifi_error(card->ospriv, "Failed to write loader restart command\n");
func_exit_r(r);
return r; return r;
} }
...@@ -896,7 +863,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -896,7 +863,6 @@ static CsrResult card_hw_init(card_t *card)
if (cfg_data == NULL) if (cfg_data == NULL)
{ {
unifi_error(card->ospriv, "Failed to find SDIO_SLOT_CONFIG Symbol\n"); unifi_error(card->ospriv, "Failed to find SDIO_SLOT_CONFIG Symbol\n");
func_exit_r(CSR_RESULT_FAILURE);
return CSR_RESULT_FAILURE; return CSR_RESULT_FAILURE;
} }
...@@ -913,12 +879,10 @@ static CsrResult card_hw_init(card_t *card) ...@@ -913,12 +879,10 @@ static CsrResult card_hw_init(card_t *card)
{ {
unifi_error(card->ospriv, "Failed to read init flag at %08lx\n", unifi_error(card->ospriv, "Failed to read init flag at %08lx\n",
card->init_flag_addr); card->init_flag_addr);
func_exit_r(r);
return r; return r;
} }
if (initialised != 0) if (initialised != 0)
{ {
func_exit_r(CSR_RESULT_FAILURE);
return CSR_RESULT_FAILURE; return CSR_RESULT_FAILURE;
} }
...@@ -940,7 +904,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -940,7 +904,6 @@ static CsrResult card_hw_init(card_t *card)
unifi_error(card->ospriv, "UniFi f/w protocol major version (%d) is different from driver (v%d.%d)\n", unifi_error(card->ospriv, "UniFi f/w protocol major version (%d) is different from driver (v%d.%d)\n",
major, UNIFI_HIP_MAJOR_VERSION, UNIFI_HIP_MINOR_VERSION); major, UNIFI_HIP_MAJOR_VERSION, UNIFI_HIP_MINOR_VERSION);
#ifndef CSR_WIFI_DISABLE_HIP_VERSION_CHECK #ifndef CSR_WIFI_DISABLE_HIP_VERSION_CHECK
func_exit_r(CSR_RESULT_FAILURE);
return CSR_RESULT_FAILURE; return CSR_RESULT_FAILURE;
#endif #endif
} }
...@@ -950,7 +913,6 @@ static CsrResult card_hw_init(card_t *card) ...@@ -950,7 +913,6 @@ static CsrResult card_hw_init(card_t *card)
major, minor, major, minor,
UNIFI_HIP_MAJOR_VERSION, UNIFI_HIP_MINOR_VERSION); UNIFI_HIP_MAJOR_VERSION, UNIFI_HIP_MINOR_VERSION);
#ifndef CSR_WIFI_DISABLE_HIP_VERSION_CHECK #ifndef CSR_WIFI_DISABLE_HIP_VERSION_CHECK
func_exit_r(CSR_RESULT_FAILURE);
return CSR_RESULT_FAILURE; return CSR_RESULT_FAILURE;
#endif #endif
} }
...@@ -1250,7 +1212,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr) ...@@ -1250,7 +1212,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to read UniFi Mailbox1 register for second time\n"); unifi_error(card->ospriv, "Failed to read UniFi Mailbox1 register for second time\n");
func_exit_r(r);
return r; return r;
} }
unifi_trace(card->ospriv, UDBG1, "MAILBOX1 value=0x%04X\n", mbox1); unifi_trace(card->ospriv, UDBG1, "MAILBOX1 value=0x%04X\n", mbox1);
...@@ -1269,7 +1230,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr) ...@@ -1269,7 +1230,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr)
{ {
unifi_trace(card->ospriv, UDBG1, "Timeout waiting for firmware to start, Mailbox1 still 0 after %d ms\n", unifi_trace(card->ospriv, UDBG1, "Timeout waiting for firmware to start, Mailbox1 still 0 after %d ms\n",
MAILBOX1_ATTEMPTS * MAILBOX1_TIMEOUT); MAILBOX1_ATTEMPTS * MAILBOX1_TIMEOUT);
func_exit_r(CSR_RESULT_FAILURE);
return CSR_RESULT_FAILURE; return CSR_RESULT_FAILURE;
} }
...@@ -1285,7 +1245,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr) ...@@ -1285,7 +1245,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to write f/w startup handshake to MAILBOX2\n"); unifi_error(card->ospriv, "Failed to write f/w startup handshake to MAILBOX2\n");
func_exit_r(r);
return r; return r;
} }
...@@ -1303,7 +1262,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr) ...@@ -1303,7 +1262,6 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, u32 *paddr)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to read UniFi Mailbox0 register\n"); unifi_error(card->ospriv, "Failed to read UniFi Mailbox0 register\n");
func_exit_r(r);
return r; return r;
} }
...@@ -1480,7 +1438,6 @@ static CsrResult card_access_panic(card_t *card) ...@@ -1480,7 +1438,6 @@ static CsrResult card_access_panic(card_t *card)
} }
r = ConvertCsrSdioToCsrHipResult(card, sr); r = ConvertCsrSdioToCsrHipResult(card, sr);
func_exit_r(r);
return r; return r;
} }
...@@ -1596,7 +1553,6 @@ static CsrResult card_allocate_memory_resources(card_t *card) ...@@ -1596,7 +1553,6 @@ static CsrResult card_allocate_memory_resources(card_t *card)
if (card->fh_buffer.buf == NULL) if (card->fh_buffer.buf == NULL)
{ {
unifi_error(card->ospriv, "Failed to allocate memory for F-H signals\n"); unifi_error(card->ospriv, "Failed to allocate memory for F-H signals\n");
func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY);
return CSR_WIFI_HIP_RESULT_NO_MEMORY; return CSR_WIFI_HIP_RESULT_NO_MEMORY;
} }
card->fh_buffer.bufsize = UNIFI_FH_BUF_SIZE; card->fh_buffer.bufsize = UNIFI_FH_BUF_SIZE;
...@@ -1607,7 +1563,6 @@ static CsrResult card_allocate_memory_resources(card_t *card) ...@@ -1607,7 +1563,6 @@ static CsrResult card_allocate_memory_resources(card_t *card)
if (card->th_buffer.buf == NULL) if (card->th_buffer.buf == NULL)
{ {
unifi_error(card->ospriv, "Failed to allocate memory for T-H signals\n"); unifi_error(card->ospriv, "Failed to allocate memory for T-H signals\n");
func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY);
return CSR_WIFI_HIP_RESULT_NO_MEMORY; return CSR_WIFI_HIP_RESULT_NO_MEMORY;
} }
card->th_buffer.bufsize = UNIFI_FH_BUF_SIZE; card->th_buffer.bufsize = UNIFI_FH_BUF_SIZE;
...@@ -1629,7 +1584,6 @@ static CsrResult card_allocate_memory_resources(card_t *card) ...@@ -1629,7 +1584,6 @@ static CsrResult card_allocate_memory_resources(card_t *card)
if (card->from_host_data == NULL) if (card->from_host_data == NULL)
{ {
unifi_error(card->ospriv, "Failed to allocate memory for F-H bulk data array\n"); unifi_error(card->ospriv, "Failed to allocate memory for F-H bulk data array\n");
func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY);
return CSR_WIFI_HIP_RESULT_NO_MEMORY; return CSR_WIFI_HIP_RESULT_NO_MEMORY;
} }
...@@ -1645,7 +1599,6 @@ static CsrResult card_allocate_memory_resources(card_t *card) ...@@ -1645,7 +1599,6 @@ static CsrResult card_allocate_memory_resources(card_t *card)
if (card->fh_slot_host_tag_record == NULL) if (card->fh_slot_host_tag_record == NULL)
{ {
unifi_error(card->ospriv, "Failed to allocate memory for F-H slot host tag mapping array\n"); unifi_error(card->ospriv, "Failed to allocate memory for F-H slot host tag mapping array\n");
func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY);
return CSR_WIFI_HIP_RESULT_NO_MEMORY; return CSR_WIFI_HIP_RESULT_NO_MEMORY;
} }
...@@ -1664,7 +1617,6 @@ static CsrResult card_allocate_memory_resources(card_t *card) ...@@ -1664,7 +1617,6 @@ static CsrResult card_allocate_memory_resources(card_t *card)
if (card->to_host_data == NULL) if (card->to_host_data == NULL)
{ {
unifi_error(card->ospriv, "Failed to allocate memory for T-H bulk data array\n"); unifi_error(card->ospriv, "Failed to allocate memory for T-H bulk data array\n");
func_exit_r(CSR_WIFI_HIP_RESULT_NO_MEMORY);
return CSR_WIFI_HIP_RESULT_NO_MEMORY; return CSR_WIFI_HIP_RESULT_NO_MEMORY;
} }
...@@ -1957,14 +1909,12 @@ static CsrResult card_init_slots(card_t *card) ...@@ -1957,14 +1909,12 @@ static CsrResult card_init_slots(card_t *card)
{ {
unifi_error(card->ospriv, "Failed to allocate card memory resources.\n"); unifi_error(card->ospriv, "Failed to allocate card memory resources.\n");
card_free_memory_resources(card); card_free_memory_resources(card);
func_exit_r(r);
return r; return r;
} }
if (card->sdio_ctrl_addr == 0) if (card->sdio_ctrl_addr == 0)
{ {
unifi_error(card->ospriv, "Failed to find config struct!\n"); unifi_error(card->ospriv, "Failed to find config struct!\n");
func_exit_r(CSR_WIFI_HIP_RESULT_INVALID_VALUE);
return CSR_WIFI_HIP_RESULT_INVALID_VALUE; return CSR_WIFI_HIP_RESULT_INVALID_VALUE;
} }
...@@ -1987,7 +1937,6 @@ static CsrResult card_init_slots(card_t *card) ...@@ -1987,7 +1937,6 @@ static CsrResult card_init_slots(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to read from-host sig written count\n"); unifi_error(card->ospriv, "Failed to read from-host sig written count\n");
func_exit_r(r);
return r; return r;
} }
card->from_host_signals_w = (s16)s; card->from_host_signals_w = (s16)s;
...@@ -2001,7 +1950,6 @@ static CsrResult card_init_slots(card_t *card) ...@@ -2001,7 +1950,6 @@ static CsrResult card_init_slots(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to read to-host sig read count\n"); unifi_error(card->ospriv, "Failed to read to-host sig read count\n");
func_exit_r(r);
return r; return r;
} }
card->to_host_signals_r = (s16)s; card->to_host_signals_r = (s16)s;
...@@ -2016,7 +1964,6 @@ static CsrResult card_init_slots(card_t *card) ...@@ -2016,7 +1964,6 @@ static CsrResult card_init_slots(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to write initialised flag\n"); unifi_error(card->ospriv, "Failed to write initialised flag\n");
func_exit_r(r);
return r; return r;
} }
...@@ -2482,7 +2429,6 @@ static CsrResult unifi_prepare_hw(card_t *card) ...@@ -2482,7 +2429,6 @@ static CsrResult unifi_prepare_hw(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to identify hw\n"); unifi_error(card->ospriv, "Failed to identify hw\n");
func_exit_r(r);
return r; return r;
} }
...@@ -2507,7 +2453,6 @@ static CsrResult unifi_prepare_hw(card_t *card) ...@@ -2507,7 +2453,6 @@ static CsrResult unifi_prepare_hw(card_t *card)
if (csrResult != CSR_RESULT_SUCCESS) if (csrResult != CSR_RESULT_SUCCESS)
{ {
r = ConvertCsrSdioToCsrHipResult(card, csrResult); r = ConvertCsrSdioToCsrHipResult(card, csrResult);
func_exit_r(r);
return r; return r;
} }
card->sdio_clock_speed = UNIFI_SDIO_CLOCK_INIT_HZ; card->sdio_clock_speed = UNIFI_SDIO_CLOCK_INIT_HZ;
...@@ -2527,7 +2472,6 @@ static CsrResult unifi_prepare_hw(card_t *card) ...@@ -2527,7 +2472,6 @@ static CsrResult unifi_prepare_hw(card_t *card)
r = ConvertCsrSdioToCsrHipResult(card, csrResult); r = ConvertCsrSdioToCsrHipResult(card, csrResult);
/* Can't enable WLAN function. Try resetting the SDIO block. */ /* Can't enable WLAN function. Try resetting the SDIO block. */
unifi_error(card->ospriv, "Failed to re-enable function %d.\n", card->function); unifi_error(card->ospriv, "Failed to re-enable function %d.\n", card->function);
func_exit_r(r);
return r; return r;
} }
...@@ -2541,7 +2485,6 @@ static CsrResult unifi_prepare_hw(card_t *card) ...@@ -2541,7 +2485,6 @@ static CsrResult unifi_prepare_hw(card_t *card)
r = unifi_read_chip_version(card); r = unifi_read_chip_version(card);
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
func_exit_r(r);
return r; return r;
} }
...@@ -2568,7 +2511,6 @@ static CsrResult unifi_read_chip_version(card_t *card) ...@@ -2568,7 +2511,6 @@ static CsrResult unifi_read_chip_version(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to read GBL_CHIP_VERSION\n"); unifi_error(card->ospriv, "Failed to read GBL_CHIP_VERSION\n");
func_exit_r(r);
return r; return r;
} }
card->chip_version = ver; card->chip_version = ver;
...@@ -2581,7 +2523,6 @@ static CsrResult unifi_read_chip_version(card_t *card) ...@@ -2581,7 +2523,6 @@ static CsrResult unifi_read_chip_version(card_t *card)
unifi_info(card->ospriv, "Chip Version 0x%04X\n", card->chip_version); unifi_info(card->ospriv, "Chip Version 0x%04X\n", card->chip_version);
func_exit_r(r);
return r; return r;
} /* unifi_read_chip_version() */ } /* unifi_read_chip_version() */
...@@ -2635,7 +2576,6 @@ static CsrResult unifi_reset_hardware(card_t *card) ...@@ -2635,7 +2576,6 @@ static CsrResult unifi_reset_hardware(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "unifi_prepare_hw failed after hard reset\n"); unifi_error(card->ospriv, "unifi_prepare_hw failed after hard reset\n");
func_exit_r(r);
return r; return r;
} }
} }
...@@ -2655,7 +2595,6 @@ static CsrResult unifi_reset_hardware(card_t *card) ...@@ -2655,7 +2595,6 @@ static CsrResult unifi_reset_hardware(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "software hard reset failed\n"); unifi_error(card->ospriv, "software hard reset failed\n");
func_exit_r(r);
return r; return r;
} }
...@@ -2668,7 +2607,6 @@ static CsrResult unifi_reset_hardware(card_t *card) ...@@ -2668,7 +2607,6 @@ static CsrResult unifi_reset_hardware(card_t *card)
r = unifi_read_chip_version(card); r = unifi_read_chip_version(card);
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
func_exit_r(r);
return r; return r;
} }
} }
...@@ -2718,7 +2656,6 @@ static CsrResult unifi_reset_hardware(card_t *card) ...@@ -2718,7 +2656,6 @@ static CsrResult unifi_reset_hardware(card_t *card)
} }
func_exit_r(r);
return r; return r;
} /* unifi_reset_hardware() */ } /* unifi_reset_hardware() */
...@@ -2793,7 +2730,6 @@ static CsrResult card_reset_method_io_enable(card_t *card) ...@@ -2793,7 +2730,6 @@ static CsrResult card_reset_method_io_enable(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_warning(card->ospriv, "SDIO error writing SDIO_CSR_FUNC_EN: %d\n", r); unifi_warning(card->ospriv, "SDIO error writing SDIO_CSR_FUNC_EN: %d\n", r);
func_exit_r(r);
return r; return r;
} }
else else
...@@ -2851,7 +2787,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card) ...@@ -2851,7 +2787,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to set UNIFI_HOST_STATE_DROWSY\n"); unifi_error(card->ospriv, "Failed to set UNIFI_HOST_STATE_DROWSY\n");
func_exit_r(r);
return r; return r;
} }
CsrThreadSleep(5); CsrThreadSleep(5);
...@@ -2883,7 +2818,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card) ...@@ -2883,7 +2818,6 @@ static CsrResult card_reset_method_dbg_reset(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_warning(card->ospriv, "SDIO error writing DBG_RESET: %d\n", r); unifi_warning(card->ospriv, "SDIO error writing DBG_RESET: %d\n", r);
func_exit_r(r);
return r; return r;
} }
...@@ -2955,7 +2889,6 @@ CsrResult unifi_card_hard_reset(card_t *card) ...@@ -2955,7 +2889,6 @@ CsrResult unifi_card_hard_reset(card_t *card)
unifi_error(card->ospriv, unifi_error(card->ospriv,
"Hard reset (Code download) is unsupported\n"); "Hard reset (Code download) is unsupported\n");
func_exit_r(CSR_RESULT_FAILURE);
return CSR_RESULT_FAILURE; return CSR_RESULT_FAILURE;
} }
...@@ -2981,7 +2914,6 @@ CsrResult unifi_card_hard_reset(card_t *card) ...@@ -2981,7 +2914,6 @@ CsrResult unifi_card_hard_reset(card_t *card)
/* Software hard reset */ /* Software hard reset */
r = card_reset_method_dbg_reset(card); r = card_reset_method_dbg_reset(card);
func_exit_r(r);
return r; return r;
} /* unifi_card_hard_reset() */ } /* unifi_card_hard_reset() */
...@@ -3030,7 +2962,6 @@ CsrResult CardGenInt(card_t *card) ...@@ -3030,7 +2962,6 @@ CsrResult CardGenInt(card_t *card)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "SDIO error writing UNIFI_SHARED_IO_INTERRUPT: %d\n", r); unifi_error(card->ospriv, "SDIO error writing UNIFI_SHARED_IO_INTERRUPT: %d\n", r);
func_exit_r(r);
return r; return r;
} }
......
drivers/staging/csr/csr_wifi_hip_download.c
View file @ 1f5466b0
...@@ -68,7 +68,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut) ...@@ -68,7 +68,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Firmware hasn't started\n"); unifi_error(card->ospriv, "Firmware hasn't started\n");
func_exit_r(r);
return r; return r;
} }
*pslut = slut_address; *pslut = slut_address;
...@@ -81,7 +80,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut) ...@@ -81,7 +80,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut)
if (csrResult != CSR_RESULT_SUCCESS) if (csrResult != CSR_RESULT_SUCCESS)
{ {
r = ConvertCsrSdioToCsrHipResult(card, csrResult); r = ConvertCsrSdioToCsrHipResult(card, csrResult);
func_exit_r(r);
return r; return r;
} }
card->sdio_clock_speed = UNIFI_SDIO_CLOCK_INIT_HZ; card->sdio_clock_speed = UNIFI_SDIO_CLOCK_INIT_HZ;
...@@ -106,14 +104,12 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut) ...@@ -106,14 +104,12 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut)
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Failed to read SLUT finger print\n"); unifi_error(card->ospriv, "Failed to read SLUT finger print\n");
func_exit_r(r);
return r; return r;
} }
if (finger_print != SLUT_FINGERPRINT) if (finger_print != SLUT_FINGERPRINT)
{ {
unifi_error(card->ospriv, "Failed to find SLUT fingerprint\n"); unifi_error(card->ospriv, "Failed to find SLUT fingerprint\n");
func_exit_r(CSR_RESULT_FAILURE);
return CSR_RESULT_FAILURE; return CSR_RESULT_FAILURE;
} }
...@@ -128,7 +124,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut) ...@@ -128,7 +124,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut)
r = unifi_card_read16(card, slut_address, &id); r = unifi_card_read16(card, slut_address, &id);
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
func_exit_r(r);
return r; return r;
} }
slut_address += 2; slut_address += 2;
...@@ -143,7 +138,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut) ...@@ -143,7 +138,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut)
r = unifi_read32(card, slut_address, &obj); r = unifi_read32(card, slut_address, &obj);
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
func_exit_r(r);
return r; return r;
} }
slut_address += 4; slut_address += 4;
...@@ -161,7 +155,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut) ...@@ -161,7 +155,6 @@ static CsrResult _find_in_slut(card_t *card, symbol_t *psym, u32 *pslut)
} }
} }
func_exit_r(r);
return r; return r;
} }
...@@ -279,7 +272,6 @@ static CsrResult do_patch_convert_download(card_t *card, void *dlpriv, xbv1_t *p ...@@ -279,7 +272,6 @@ static CsrResult do_patch_convert_download(card_t *card, void *dlpriv, xbv1_t *p
if (r != CSR_RESULT_SUCCESS) if (r != CSR_RESULT_SUCCESS)
{ {
unifi_error(card->ospriv, "Converted patch download failed\n"); unifi_error(card->ospriv, "Converted patch download failed\n");
func_exit_r(r);
return r; return r;
} }
else else
...@@ -294,7 +286,6 @@ static CsrResult do_patch_convert_download(card_t *card, void *dlpriv, xbv1_t *p ...@@ -294,7 +286,6 @@ static CsrResult do_patch_convert_download(card_t *card, void *dlpriv, xbv1_t *p
unifi_error(card->ospriv, "Failed to write loader restart cmd\n"); unifi_error(card->ospriv, "Failed to write loader restart cmd\n");
} }
func_exit_r(r);
return r; return r;
} }
} }
...@@ -374,7 +365,6 @@ CsrResult unifi_dl_firmware(card_t *card, void *dlpriv) ...@@ -374,7 +365,6 @@ CsrResult unifi_dl_firmware(card_t *card, void *dlpriv)
} }
kfree(fwinfo); kfree(fwinfo);
func_exit_r(r);
return r; return r;
} /* unifi_dl_firmware() */ } /* unifi_dl_firmware() */
...@@ -456,7 +446,6 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl) ...@@ -456,7 +446,6 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, u32 boot_ctrl)
kfree(fwinfo); kfree(fwinfo);
func_exit_r(r);
return r; return r;
} /* unifi_dl_patch() */ } /* unifi_dl_patch() */
......
drivers/staging/csr/csr_wifi_hip_dump.c
View file @ 1f5466b0
...@@ -119,7 +119,6 @@ CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable) ...@@ -119,7 +119,6 @@ CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable)
r = CSR_RESULT_SUCCESS; r = CSR_RESULT_SUCCESS;
} }
func_exit_r(r);
return r; return r;
} }
...@@ -156,7 +155,6 @@ CsrResult unifi_coredump_handle_request(card_t *card) ...@@ -156,7 +155,6 @@ CsrResult unifi_coredump_handle_request(card_t *card)
} }
} }
func_exit_r(r);
return r; return r;
} }
...@@ -263,7 +261,6 @@ CsrResult unifi_coredump_capture(card_t *card, struct unifi_coredump_req *req) ...@@ -263,7 +261,6 @@ CsrResult unifi_coredump_capture(card_t *card, struct unifi_coredump_req *req)
} }
done: done:
func_exit_r(r);
return r; return r;
} /* unifi_coredump_capture() */ } /* unifi_coredump_capture() */
...@@ -444,7 +441,6 @@ CsrResult unifi_coredump_get_value(card_t *card, struct unifi_coredump_req *req) ...@@ -444,7 +441,6 @@ CsrResult unifi_coredump_get_value(card_t *card, struct unifi_coredump_req *req)
req->serial = find_dump->count; req->serial = find_dump->count;
done: done:
func_exit_r(r);
return r; return r;
} /* unifi_coredump_get_value() */ } /* unifi_coredump_get_value() */
...@@ -511,7 +507,6 @@ static CsrResult unifi_coredump_read_zone(card_t *card, u16 *zonebuf, const stru ...@@ -511,7 +507,6 @@ static CsrResult unifi_coredump_read_zone(card_t *card, u16 *zonebuf, const stru
} }
done: done:
func_exit_r(r);
return r; return r;
} }
...@@ -549,7 +544,6 @@ static CsrResult unifi_coredump_read_zones(card_t *card, coredump_buffer *dump_b ...@@ -549,7 +544,6 @@ static CsrResult unifi_coredump_read_zones(card_t *card, coredump_buffer *dump_b
r = unifi_coredump_read_zone(card, dump_buf->zone[i], &zonedef_table[i]); r = unifi_coredump_read_zone(card, dump_buf->zone[i], &zonedef_table[i]);
} }
func_exit_r(r);
return r; return r;
} }
...@@ -620,7 +614,6 @@ static CsrResult unifi_coredump_from_sdio(card_t *card, coredump_buffer *dump_bu ...@@ -620,7 +614,6 @@ static CsrResult unifi_coredump_from_sdio(card_t *card, coredump_buffer *dump_bu
} }
done: done:
func_exit_r(r);
return r; return r;
} /* unifi_coredump_from_sdio() */ } /* unifi_coredump_from_sdio() */
......
drivers/staging/csr/drv.c
View file @ 1f5466b0
...@@ -516,7 +516,6 @@ unifi_read(struct file *filp, char *p, size_t len, loff_t *poff) ...@@ -516,7 +516,6 @@ unifi_read(struct file *filp, char *p, size_t len, loff_t *poff)
/* It is our resposibility to free the message buffer. */ /* It is our resposibility to free the message buffer. */
kfree(logptr); kfree(logptr);
func_exit_r(msglen);
return msglen; return msglen;
} /* unifi_read() */ } /* unifi_read() */
...@@ -729,8 +728,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen) ...@@ -729,8 +728,6 @@ udi_send_signal_raw(unifi_priv_t *priv, unsigned char *buf, int buflen)
} }
#endif #endif
func_exit_r(bytecount);
return bytecount; return bytecount;
} /* udi_send_signal_raw */ } /* udi_send_signal_raw */
...@@ -925,8 +922,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff) ...@@ -925,8 +922,6 @@ unifi_write(struct file *filp, const char *p, size_t len, loff_t *poff)
kfree(buf); kfree(buf);
func_exit_r(bytes_written);
return bytes_written; return bytes_written;
} /* unifi_write() */ } /* unifi_write() */
......
drivers/staging/csr/sdio_mmc.c
View file @ 1f5466b0
...@@ -151,7 +151,6 @@ CsrSdioRead8(CsrSdioFunction *function, u32 address, u8 *data) ...@@ -151,7 +151,6 @@ CsrSdioRead8(CsrSdioFunction *function, u32 address, u8 *data)
_sdio_release_host(func); _sdio_release_host(func);
if (err) { if (err) {
func_exit_r(err);
return ConvertSdioToCsrSdioResult(err); return ConvertSdioToCsrSdioResult(err);
} }
...@@ -169,7 +168,6 @@ CsrSdioWrite8(CsrSdioFunction *function, u32 address, u8 data) ...@@ -169,7 +168,6 @@ CsrSdioWrite8(CsrSdioFunction *function, u32 address, u8 data)
_sdio_release_host(func); _sdio_release_host(func);
if (err) { if (err) {
func_exit_r(err);
return ConvertSdioToCsrSdioResult(err); return ConvertSdioToCsrSdioResult(err);
} }
...@@ -245,7 +243,6 @@ CsrSdioF0Read8(CsrSdioFunction *function, u32 address, u8 *data) ...@@ -245,7 +243,6 @@ CsrSdioF0Read8(CsrSdioFunction *function, u32 address, u8 *data)
_sdio_release_host(func); _sdio_release_host(func);
if (err) { if (err) {
func_exit_r(err);
return ConvertSdioToCsrSdioResult(err); return ConvertSdioToCsrSdioResult(err);
} }
...@@ -267,7 +264,6 @@ CsrSdioF0Write8(CsrSdioFunction *function, u32 address, u8 data) ...@@ -267,7 +264,6 @@ CsrSdioF0Write8(CsrSdioFunction *function, u32 address, u8 data)
_sdio_release_host(func); _sdio_release_host(func);
if (err) { if (err) {
func_exit_r(err);
return ConvertSdioToCsrSdioResult(err); return ConvertSdioToCsrSdioResult(err);
} }
...@@ -286,7 +282,6 @@ CsrSdioRead(CsrSdioFunction *function, u32 address, void *data, u32 length) ...@@ -286,7 +282,6 @@ CsrSdioRead(CsrSdioFunction *function, u32 address, void *data, u32 length)
_sdio_release_host(func); _sdio_release_host(func);
if (err) { if (err) {
func_exit_r(err);
return ConvertSdioToCsrSdioResult(err); return ConvertSdioToCsrSdioResult(err);
} }
...@@ -304,7 +299,6 @@ CsrSdioWrite(CsrSdioFunction *function, u32 address, const void *data, u32 lengt ...@@ -304,7 +299,6 @@ CsrSdioWrite(CsrSdioFunction *function, u32 address, const void *data, u32 lengt
_sdio_release_host(func); _sdio_release_host(func);
if (err) { if (err) {
func_exit_r(err);
return ConvertSdioToCsrSdioResult(err); return ConvertSdioToCsrSdioResult(err);
} }
......
drivers/staging/csr/sme_wext.c
View file @ 1f5466b0
...@@ -2202,7 +2202,6 @@ unifi_siwencode(struct net_device *dev, struct iw_request_info *info, ...@@ -2202,7 +2202,6 @@ unifi_siwencode(struct net_device *dev, struct iw_request_info *info,
CSR_WIFI_SME_ENCRYPTION_CIPHER_NONE; CSR_WIFI_SME_ENCRYPTION_CIPHER_NONE;
} }
func_exit_r(rc);
return convert_sme_error(rc); return convert_sme_error(rc);
} /* unifi_siwencode() */ } /* unifi_siwencode() */
...@@ -2453,7 +2452,6 @@ unifi_siwmlme(struct net_device *dev, struct iw_request_info *info, ...@@ -2453,7 +2452,6 @@ unifi_siwmlme(struct net_device *dev, struct iw_request_info *info,
UF_RTNL_LOCK(); UF_RTNL_LOCK();
break; break;
default: default:
func_exit_r(-EOPNOTSUPP);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
......
drivers/staging/csr/unifi_os.h
View file @ 1f5466b0
...@@ -61,14 +61,6 @@ extern int unifi_debug; ...@@ -61,14 +61,6 @@ extern int unifi_debug;
* etc. * etc.
*/ */
#define func_exit_r(_rc) \
do { \
if (unifi_debug >= 5) { \
printk("unifi: <= %s %d\n", __FUNCTION__, (int)(_rc)); \
} \
} while (0)
#define ASSERT(cond) \ #define ASSERT(cond) \
do { \ do { \
if (!(cond)) { \ if (!(cond)) { \
...@@ -95,7 +87,6 @@ void unifi_trace(void* ospriv, int level, const char *fmt, ...); ...@@ -95,7 +87,6 @@ void unifi_trace(void* ospriv, int level, const char *fmt, ...);
#else #else
/* Stubs */ /* Stubs */
#define func_exit_r(_rc)
#define ASSERT(cond) #define ASSERT(cond)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7