Commit 0e7ba8eb authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

staging: wilc1000: fix line over 80 character in handle_disconnect()

Refactor handle_disconnect() to avoid line over 80 characters issue
reported by checkpatch.pl script.
Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 54300bfb
...@@ -1801,7 +1801,9 @@ static void handle_disconnect(struct wilc_vif *vif) ...@@ -1801,7 +1801,9 @@ static void handle_disconnect(struct wilc_vif *vif)
{ {
struct wid wid; struct wid wid;
struct host_if_drv *hif_drv = vif->hif_drv; struct host_if_drv *hif_drv = vif->hif_drv;
struct disconnect_info disconn_info;
struct user_scan_req *scan_req;
struct user_conn_req *conn_req;
s32 result = 0; s32 result = 0;
u16 dummy_reason_code = 0; u16 dummy_reason_code = 0;
...@@ -1820,33 +1822,30 @@ static void handle_disconnect(struct wilc_vif *vif) ...@@ -1820,33 +1822,30 @@ static void handle_disconnect(struct wilc_vif *vif)
if (result) { if (result) {
netdev_err(vif->ndev, "Failed to send dissconect\n"); netdev_err(vif->ndev, "Failed to send dissconect\n");
} else { goto out;
struct disconnect_info disconn_info; }
memset(&disconn_info, 0, sizeof(struct disconnect_info)); memset(&disconn_info, 0, sizeof(struct disconnect_info));
disconn_info.reason = 0; disconn_info.reason = 0;
disconn_info.ie = NULL; disconn_info.ie = NULL;
disconn_info.ie_len = 0; disconn_info.ie_len = 0;
scan_req = &hif_drv->usr_scan_req;
conn_req = &hif_drv->usr_conn_req;
if (hif_drv->usr_scan_req.scan_result) { if (scan_req->scan_result) {
del_timer(&hif_drv->scan_timer); del_timer(&hif_drv->scan_timer);
hif_drv->usr_scan_req.scan_result(SCAN_EVENT_ABORTED, scan_req->scan_result(SCAN_EVENT_ABORTED, NULL, scan_req->arg,
NULL,
hif_drv->usr_scan_req.arg,
NULL); NULL);
hif_drv->usr_scan_req.scan_result = NULL; scan_req->scan_result = NULL;
} }
if (hif_drv->usr_conn_req.conn_result) { if (conn_req->conn_result) {
if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP)
del_timer(&hif_drv->connect_timer); del_timer(&hif_drv->connect_timer);
hif_drv->usr_conn_req.conn_result(CONN_DISCONN_EVENT_DISCONN_NOTIF, conn_req->conn_result(CONN_DISCONN_EVENT_DISCONN_NOTIF, NULL,
NULL, 0, &disconn_info, conn_req->arg);
0,
&disconn_info,
hif_drv->usr_conn_req.arg);
} else { } else {
netdev_err(vif->ndev, "conn_result = NULL\n"); netdev_err(vif->ndev, "conn_result = NULL\n");
} }
...@@ -1857,14 +1856,14 @@ static void handle_disconnect(struct wilc_vif *vif) ...@@ -1857,14 +1856,14 @@ static void handle_disconnect(struct wilc_vif *vif)
eth_zero_addr(hif_drv->assoc_bssid); eth_zero_addr(hif_drv->assoc_bssid);
hif_drv->usr_conn_req.ssid_len = 0; conn_req->ssid_len = 0;
kfree(hif_drv->usr_conn_req.ssid); kfree(conn_req->ssid);
hif_drv->usr_conn_req.ssid = NULL; conn_req->ssid = NULL;
kfree(hif_drv->usr_conn_req.bssid); kfree(conn_req->bssid);
hif_drv->usr_conn_req.bssid = NULL; conn_req->bssid = NULL;
hif_drv->usr_conn_req.ies_len = 0; conn_req->ies_len = 0;
kfree(hif_drv->usr_conn_req.ies); kfree(conn_req->ies);
hif_drv->usr_conn_req.ies = NULL; conn_req->ies = NULL;
if (join_req && join_req_vif == vif) { if (join_req && join_req_vif == vif) {
kfree(join_req); kfree(join_req);
...@@ -1875,7 +1874,8 @@ static void handle_disconnect(struct wilc_vif *vif) ...@@ -1875,7 +1874,8 @@ static void handle_disconnect(struct wilc_vif *vif)
kfree(info_element); kfree(info_element);
info_element = NULL; info_element = NULL;
} }
}
out:
complete(&hif_drv->comp_test_disconn_block); complete(&hif_drv->comp_test_disconn_block);
} }
......
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