--- drivers/staging/brcm80211/brcmfmac/wl_iw.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c index b49957f..32b0ec5 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c @@ -23,7 +23,7 @@ #include <bcmutils.h> #include <linux/if_arp.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <dngl_stats.h> #include <dhd.h> @@ -777,9 +777,8 @@ wl_iw_set_wap(struct net_device *dev, error = dev_wlc_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size); - if (error) { + if (error) WL_ERROR("%s Invalid ioctl data=%d\n", __func__, error); - } if (g_ssid.SSID_len) { WL_TRACE("%s: join SSID=%s BSSID=%pM ch=%d\n", @@ -1094,9 +1093,8 @@ static u32 wl_iw_iscan_get(iscan_info_t *iscan) iscan->list_hdr = buf; else { ptr = iscan->list_hdr; - while (ptr->next) { + while (ptr->next) ptr = ptr->next; - } ptr->next = buf; } } @@ -1340,9 +1338,8 @@ wl_iw_iscan_set_scan(struct net_device *dev, return 0; } #ifdef PNO_SUPPORT - if (dhd_dev_get_pno_status(dev)) { + if (dhd_dev_get_pno_status(dev)) WL_ERROR("%s: Scan called when PNO is active\n", __func__); - } #endif if ((!iscan) || (!iscan->sysioc_tsk)) @@ -3341,9 +3338,9 @@ wl_iw_check_conn_fail(wl_event_msg_t *e, char *stringBuf, uint buflen) u32 status = be32_to_cpu(e->status); u32 reason = be32_to_cpu(e->reason); - if (wl_iw_conn_status_str(event, status, reason, stringBuf, buflen)) { + if (wl_iw_conn_status_str(event, status, reason, stringBuf, buflen)) return true; - } else + else return false; } #endif -- 1.7.2.5 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel