From: root <root@ubuntu.(none)>
This cleans up the brace placement coding issues.
Signed-off-by: Sungju Huh <sjhuh@xxxxxxxxxxxxxxxxx>
---
drivers/staging/csr/sme_blocking.c | 207 +++++++++++++-----------------------
1 file changed, 72 insertions(+), 135 deletions(-)
diff --git a/drivers/staging/csr/sme_blocking.c b/drivers/staging/csr/sme_blocking.c
index b246aeb..a1de8db 100644
--- a/drivers/staging/csr/sme_blocking.c
+++ b/drivers/staging/csr/sme_blocking.c
@@ -161,7 +161,7 @@ uf_sme_cancel_request(unifi_priv_t *priv, CsrResult reply_status)
/* Wake up the wait with an error status */
priv->sme_reply.request_status = SME_REQUEST_CANCELLED;
- priv->sme_reply.reply_status = reply_status; /* unimportant since the CANCELLED state will fail the ioctl */
+ priv->sme_reply.reply_status = reply_status; /* unimportant since the CANCELLED state will fail the ioctl */
wake_up_interruptible(&priv->sme_request_wq);
@@ -243,9 +243,9 @@ int sme_mgt_wifi_on(unifi_priv_t *priv)
/* Start the SME */
#ifdef CSR_SUPPORT_WEXT_AP
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
+
#endif
CsrWifiSmeWifiOnReqSend(0, priv->sta_mac_address, numElements, dataList);
#ifdef CSR_SUPPORT_WEXT_AP
@@ -270,17 +270,15 @@ int sme_mgt_wifi_off(unifi_priv_t *priv)
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
/* Stop the SME */
CsrWifiSmeWifiOffReqSend(0);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_LONG_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
unifi_trace(priv, UDBG4,
"sme_mgt_wifi_off: unifi_mgt_wifi_off_req <-- (r=%d, status=%d)\n",
@@ -300,16 +298,14 @@ int sme_mgt_key(unifi_priv_t *priv, CsrWifiSmeKey *sme_key,
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeKeyReqSend(0, CSR_WIFI_INTERFACE_IN_USE, action, *sme_key);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
return convert_sme_error(priv->sme_reply.reply_status);
}
@@ -332,9 +328,9 @@ int sme_mgt_scan_full(unifi_priv_t *priv,
unifi_trace(priv, UDBG4, "sme_mgt_scan_full: -->\n");
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
+
/* If a channel list is provided, do an active scan */
if (is_active) {
@@ -354,16 +350,14 @@ int sme_mgt_scan_full(unifi_priv_t *priv,
0, NULL);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_LONG_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
unifi_trace(priv, UDBG4, "sme_mgt_scan_full: <-- (status=%d)\n", priv->sme_reply.reply_status);
- if (priv->sme_reply.reply_status == CSR_WIFI_RESULT_UNAVAILABLE) {
+ if (priv->sme_reply.reply_status == CSR_WIFI_RESULT_UNAVAILABLE)
return 0; /* initial scan already underway */
- } else {
+ else
return convert_sme_error(priv->sme_reply.reply_status);
- }
}
@@ -385,15 +379,13 @@ int sme_mgt_scan_results_get_async(unifi_priv_t *priv,
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeScanResultsGetReqSend(0);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_LONG_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
scan_result_list_count = priv->sme_reply.reply_scan_results_count;
scan_result_list = priv->sme_reply.reply_scan_results;
@@ -454,15 +446,13 @@ int sme_mgt_connect(unifi_priv_t *priv)
priv->connection_config.ssid.ssid);
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeConnectReqSend(0, CSR_WIFI_INTERFACE_IN_USE, priv->connection_config);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
if (priv->sme_reply.reply_status) {
unifi_trace(priv, UDBG1, "sme_mgt_connect: failed with SME status %d\n",
@@ -483,15 +473,13 @@ int sme_mgt_disconnect(unifi_priv_t *priv)
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeDisconnectReqSend(0, CSR_WIFI_INTERFACE_IN_USE);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
unifi_trace(priv, UDBG4, "sme_mgt_disconnect: <-- (status=%d)\n", priv->sme_reply.reply_status);
return convert_sme_error(priv->sme_reply.reply_status);
@@ -510,16 +498,14 @@ int sme_mgt_pmkid(unifi_priv_t *priv,
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmePmkidReqSend(0, CSR_WIFI_INTERFACE_IN_USE, action,
pmkid_list->pmkidsCount, pmkid_list->pmkids);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
unifi_trace(priv, UDBG4, "sme_mgt_pmkid: <-- (status=%d)\n", priv->sme_reply.reply_status);
return convert_sme_error(priv->sme_reply.reply_status);
@@ -537,9 +523,8 @@ int sme_mgt_mib_get(unifi_priv_t *priv,
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
priv->mib_cfm_buffer = varbind;
priv->mib_cfm_buffer_length = MAX_VARBIND_LENGTH;
@@ -571,15 +556,13 @@ int sme_mgt_mib_set(unifi_priv_t *priv,
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeMibSetReqSend(0, length, varbind);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
unifi_trace(priv, UDBG4, "sme_mgt_mib_set: <-- (status=%d)\n", priv->sme_reply.reply_status);
return convert_sme_error(priv->sme_reply.reply_status);
@@ -598,16 +581,14 @@ int sme_mgt_power_config_set(unifi_priv_t *priv, CsrWifiSmePowerConfig *powerCon
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmePowerConfigSetReqSend(0, *powerConfig);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
unifi_trace(priv, UDBG4,
"sme_mgt_set_value_async: unifi_mgt_set_value_req <-- (r=%d status=%d)\n",
@@ -637,29 +618,26 @@ int sme_mgt_sme_config_set(unifi_priv_t *priv, CsrWifiSmeStaConfig *staConfig, C
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeSmeStaConfigSetReqSend(0, CSR_WIFI_INTERFACE_IN_USE, *staConfig);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
+
unifi_trace(priv, UDBG4,
"sme_mgt_sme_config_set: CsrWifiSmeSmeStaConfigSetReq <-- (r=%d status=%d)\n",
r, priv->sme_reply.reply_status);
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeSmeCommonConfigSetReqSend(0, *deviceConfig);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
unifi_trace(priv, UDBG4,
"sme_mgt_sme_config_set: CsrWifiSmeSmeCommonConfigSetReq <-- (r=%d status=%d)\n",
@@ -693,16 +671,14 @@ int sme_mgt_mib_config_set(unifi_priv_t *priv, CsrWifiSmeMibConfig *mibConfig)
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeMibConfigSetReqSend(0, *mibConfig);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
unifi_trace(priv, UDBG4,
"sme_mgt_mib_config_set: unifi_mgt_set_mib_config_req <-- (r=%d status=%d)\n",
@@ -732,16 +708,14 @@ int sme_mgt_coex_config_set(unifi_priv_t *priv, CsrWifiSmeCoexConfig *coexConfig
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeCoexConfigSetReqSend(0, *coexConfig);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
unifi_trace(priv, UDBG4,
"sme_mgt_coex_config_set: unifi_mgt_set_mib_config_req <-- (r=%d status=%d)\n",
@@ -773,16 +747,14 @@ int sme_mgt_host_config_set(unifi_priv_t *priv, CsrWifiSmeHostConfig *hostConfig
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeHostConfigSetReqSend(0, CSR_WIFI_INTERFACE_IN_USE, *hostConfig);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
unifi_trace(priv, UDBG4,
"sme_mgt_host_config_set: unifi_mgt_set_host_config_req <-- (r=%d status=%d)\n",
@@ -815,16 +787,14 @@ int sme_mgt_versions_get(unifi_priv_t *priv, CsrWifiSmeVersions *versions)
unifi_trace(priv, UDBG4, "sme_mgt_versions_get: unifi_mgt_versions_get_req -->\n");
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeVersionsGetReqSend(0);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
/* store the reply */
if (versions != NULL) {
@@ -861,16 +831,14 @@ int sme_mgt_power_config_get(unifi_priv_t *priv, CsrWifiSmePowerConfig *powerCon
unifi_trace(priv, UDBG4, "sme_mgt_power_config_get: unifi_mgt_power_config_req -->\n");
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmePowerConfigGetReqSend(0);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
/* store the reply */
if (powerConfig != NULL) {
@@ -905,16 +873,14 @@ int sme_mgt_host_config_get(unifi_priv_t *priv, CsrWifiSmeHostConfig *hostConfig
unifi_trace(priv, UDBG4, "sme_mgt_host_config_get: unifi_mgt_host_config_get_req -->\n");
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeHostConfigGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
/* store the reply */
if (hostConfig != NULL) {
@@ -951,15 +917,13 @@ int sme_mgt_sme_config_get(unifi_priv_t *priv, CsrWifiSmeStaConfig *staConfig, C
/* Common device config */
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeSmeCommonConfigGetReqSend(0);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
/* store the reply */
if (deviceConfig != NULL) {
@@ -970,15 +934,13 @@ int sme_mgt_sme_config_get(unifi_priv_t *priv, CsrWifiSmeStaConfig *staConfig, C
/* STA config */
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeSmeStaConfigGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
/* store the reply */
if (staConfig != NULL) {
@@ -1014,16 +976,14 @@ int sme_mgt_coex_info_get(unifi_priv_t *priv, CsrWifiSmeCoexInfo *coexInfo)
unifi_trace(priv, UDBG4, "sme_mgt_coex_info_get: unifi_mgt_coex_info_get_req -->\n");
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeCoexInfoGetReqSend(0);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
/* store the reply */
if (coexInfo != NULL) {
@@ -1060,16 +1020,14 @@ int sme_mgt_coex_config_get(unifi_priv_t *priv, CsrWifiSmeCoexConfig *coexConfig
unifi_trace(priv, UDBG4, "sme_mgt_coex_config_get: unifi_mgt_coex_config_get_req -->\n");
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeCoexConfigGetReqSend(0);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
/* store the reply */
if (coexConfig != NULL) {
@@ -1104,16 +1062,14 @@ int sme_mgt_mib_config_get(unifi_priv_t *priv, CsrWifiSmeMibConfig *mibConfig)
unifi_trace(priv, UDBG4, "sme_mgt_mib_config_get: unifi_mgt_mib_config_get_req -->\n");
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeMibConfigGetReqSend(0);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
/* store the reply */
if (mibConfig != NULL) {
@@ -1148,16 +1104,14 @@ int sme_mgt_connection_info_get(unifi_priv_t *priv, CsrWifiSmeConnectionInfo *co
unifi_trace(priv, UDBG4, "sme_mgt_connection_info_get: unifi_mgt_connection_info_get_req -->\n");
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeConnectionInfoGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
/* store the reply */
if (connectionInfo != NULL) {
@@ -1192,16 +1146,14 @@ int sme_mgt_connection_config_get(unifi_priv_t *priv, CsrWifiSmeConnectionConfig
unifi_trace(priv, UDBG4, "sme_mgt_connection_config_get: unifi_mgt_connection_config_get_req -->\n");
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeConnectionConfigGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
/* store the reply */
if (connectionConfig != NULL) {
@@ -1236,16 +1188,14 @@ int sme_mgt_connection_stats_get(unifi_priv_t *priv, CsrWifiSmeConnectionStats *
unifi_trace(priv, UDBG4, "sme_mgt_connection_stats_get: unifi_mgt_connection_stats_get_req -->\n");
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeConnectionStatsGetReqSend(0, CSR_WIFI_INTERFACE_IN_USE);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
/* store the reply */
if (connectionStats != NULL) {
@@ -1309,18 +1259,16 @@ int sme_mgt_tspec(unifi_priv_t *priv, CsrWifiSmeListAction action,
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiSmeTspecReqSend(0, CSR_WIFI_INTERFACE_IN_USE,
action, tid, TRUE, 0,
tspec->length, tspec->data,
tclas->length, tclas->data);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
unifi_trace(priv, UDBG4, "sme_mgt_tspec: <-- (status=%d)\n", priv->sme_reply.reply_status);
return convert_sme_error(priv->sme_reply.reply_status);
@@ -1339,9 +1287,8 @@ int sme_sys_suspend(unifi_priv_t *priv)
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
/* Suspend the SME, which MAY cause it to power down UniFi */
CsrWifiRouterCtrlSuspendIndSend(priv->CSR_WIFI_SME_IFACEQUEUE, 0, 0, priv->wol_suspend);
@@ -1377,9 +1324,8 @@ int sme_sys_suspend(unifi_priv_t *priv)
* the card interrupt only wakes the host. The card will be polled
* after resume to handle any pending data.
*/
- if (csr_sdio_linux_remove_irq(priv->sdio)) {
+ if (csr_sdio_linux_remove_irq(priv->sdio))
unifi_notice(priv, "WOL csr_sdio_linux_remove_irq failed\n");
- }
if (enable_wol == UNIFI_WOL_SDIO) {
/* Because csr_sdio_linux_remove_irq() disabled the card SDIO interrupt,
@@ -1391,12 +1337,10 @@ int sme_sys_suspend(unifi_priv_t *priv)
csrResult = CsrSdioInterruptEnable(priv->sdio);
CsrSdioRelease(priv->sdio);
- if (csrResult != CSR_RESULT_SUCCESS) {
+ if (csrResult != CSR_RESULT_SUCCESS)
unifi_error(priv, "WOL CsrSdioInterruptEnable failed %d\n", csrResult);
- }
- } else {
- unifi_trace(priv, UDBG1, "Disabled card SDIO interrupt for PIO WOL\n");
- }
+ else
+ unifi_trace(priv, UDBG1, "Disabled card SDIO interrupt for PIO WOL\n");
/* Prevent the BH thread from running during the suspend.
* Upon resume, sme_sys_resume() will trigger a wifi-on, this will cause
@@ -1427,17 +1371,15 @@ int sme_sys_resume(unifi_priv_t *priv)
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiRouterCtrlResumeIndSend(priv->CSR_WIFI_SME_IFACEQUEUE, 0, priv->wol_suspend);
r = sme_wait_for_reply(priv, UNIFI_SME_SYS_LONG_TIMEOUT);
- if (r) {
+ if (r)
unifi_notice(priv,
"resume: SME did not reply, return success anyway\n");
- }
return 0;
}
@@ -1453,16 +1395,14 @@ int sme_ap_stop(unifi_priv_t *priv, u16 interface_tag)
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiNmeApStopReqSend(0, interface_tag);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
unifi_trace(priv, UDBG4,
"sme_ap_stop <-- (r=%d status=%d)\n",
@@ -1484,9 +1424,8 @@ int sme_ap_start(unifi_priv_t *priv, u16 interface_tag,
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiNmeApStartReqSend(0, interface_tag, CSR_WIFI_AP_TYPE_LEGACY, FALSE,
ap_config->ssid, 1, ap_config->channel,
@@ -1494,9 +1433,8 @@ int sme_ap_start(unifi_priv_t *priv, u16 interface_tag,
p2p_go_param, FALSE);
r = sme_wait_for_reply(priv, UNIFI_SME_MGT_SHORT_TIMEOUT);
- if (r) {
+ if (r)
return r;
- }
unifi_trace(priv, UDBG4,
"sme_ap_start <-- (r=%d status=%d)\n",
@@ -1518,9 +1456,8 @@ int sme_ap_config(unifi_priv_t *priv,
}
r = sme_init_request(priv);
- if (r) {
+ if (r)
return -EIO;
- }
CsrWifiNmeApConfigSetReqSend(0, *group_security_config,
*ap_mac_config);
--
1.7.9.5
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
