From: Ajay Singh Date: Fri, 2 Mar 2018 14:22:48 +0000 (+0530) Subject: staging: wilc1000: fix line over 80 char in handle_rcvd_ntwrk_info() X-Git-Tag: v4.17-rc1~124^2~245 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b9ccd3bdb4736625e27a3058f39a7f776abca90;p=thirdparty%2Flinux.git staging: wilc1000: fix line over 80 char in handle_rcvd_ntwrk_info() Fix 'line over 80 character' issues found by checkpatch.pl script by use of temporary variable and avoided leading tab. Signed-off-by: Ajay Singh Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 19c74834cb877..2354666172d76 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -1267,51 +1267,51 @@ static s32 handle_rcvd_ntwrk_info(struct wilc_vif *vif, struct network_info *info = NULL; void *params = NULL; struct host_if_drv *hif_drv = vif->hif_drv; + struct user_scan_req *scan_req = &hif_drv->usr_scan_req; found = true; - if (hif_drv->usr_scan_req.scan_result) { - wilc_parse_network_info(rcvd_info->buffer, &info); - if (!info || !hif_drv->usr_scan_req.scan_result) { - netdev_err(vif->ndev, "driver is null\n"); - result = -EINVAL; - goto done; - } + if (!scan_req->scan_result) + goto done; - for (i = 0; i < hif_drv->usr_scan_req.rcvd_ch_cnt; i++) { - if (memcmp(hif_drv->usr_scan_req.net_info[i].bssid, - info->bssid, 6) == 0) { - if (info->rssi <= hif_drv->usr_scan_req.net_info[i].rssi) { - goto done; - } else { - hif_drv->usr_scan_req.net_info[i].rssi = info->rssi; - found = false; - break; - } + wilc_parse_network_info(rcvd_info->buffer, &info); + if (!info || !scan_req->scan_result) { + netdev_err(vif->ndev, "driver is null\n"); + result = -EINVAL; + goto done; + } + + for (i = 0; i < scan_req->rcvd_ch_cnt; i++) { + if (memcmp(scan_req->net_info[i].bssid, info->bssid, 6) == 0) { + if (info->rssi <= scan_req->net_info[i].rssi) { + goto done; + } else { + scan_req->net_info[i].rssi = info->rssi; + found = false; + break; } } + } - if (found) { - if (hif_drv->usr_scan_req.rcvd_ch_cnt < MAX_NUM_SCANNED_NETWORKS) { - hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.rcvd_ch_cnt].rssi = info->rssi; + if (found) { + if (scan_req->rcvd_ch_cnt < MAX_NUM_SCANNED_NETWORKS) { + scan_req->net_info[scan_req->rcvd_ch_cnt].rssi = info->rssi; - memcpy(hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.rcvd_ch_cnt].bssid, - info->bssid, 6); + memcpy(scan_req->net_info[scan_req->rcvd_ch_cnt].bssid, + info->bssid, 6); - hif_drv->usr_scan_req.rcvd_ch_cnt++; + scan_req->rcvd_ch_cnt++; - info->new_network = true; - params = host_int_parse_join_bss_param(info); + info->new_network = true; + params = host_int_parse_join_bss_param(info); - hif_drv->usr_scan_req.scan_result(SCAN_EVENT_NETWORK_FOUND, info, - hif_drv->usr_scan_req.arg, - params); - } - } else { - info->new_network = false; - hif_drv->usr_scan_req.scan_result(SCAN_EVENT_NETWORK_FOUND, info, - hif_drv->usr_scan_req.arg, NULL); + scan_req->scan_result(SCAN_EVENT_NETWORK_FOUND, info, + scan_req->arg, params); } + } else { + info->new_network = false; + scan_req->scan_result(SCAN_EVENT_NETWORK_FOUND, info, + scan_req->arg, NULL); } done: