From patchwork Thu May 25 17:28:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marko Stankovic X-Patchwork-Id: 9748777 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9CC0060209 for ; Thu, 25 May 2017 17:28:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 810CF22638 for ; Thu, 25 May 2017 17:28:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72D762808F; Thu, 25 May 2017 17:28:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E692D22638 for ; Thu, 25 May 2017 17:28:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424778AbdEYR2r (ORCPT ); Thu, 25 May 2017 13:28:47 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:32975 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936582AbdEYR2q (ORCPT ); Thu, 25 May 2017 13:28:46 -0400 Received: by mail-wm0-f68.google.com with SMTP id b84so38850756wmh.0 for ; Thu, 25 May 2017 10:28:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mudC6WVM/MQhztjIu93VSMThcE5/MIqfqy3rxitL5R4=; b=jg6afcZTTPJQbxjpIELpt/k1uzZOcQGfM1ABmoNxA8A2e+yxpc2TW2dEn7/o+TShqd tU24rzHsh0zcpvNWEzP7aWHQpq++dpKYfAPnov6c3IEaU65wqAh+fxMR/fvh3AI9+3yh kq+19+zFRkp9ZOdG43GZn9+AVDDBU0a0N1O/IQyDXMUosqGqaCvxkmCPIM40Cka3e2jJ X6tCunfwWKlhMCyjeIJeYzQQ59m0STniY1sud8QqZV4E6Gwg9Vbn2/8i2o9Lh9FUxGSs 2rVoJ9v+TsY5EnR/5mvBxSPNXMpzatA1CHTqw6gt8ziWdyw2yGWJLBatZGtu4x+wPKai F9+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mudC6WVM/MQhztjIu93VSMThcE5/MIqfqy3rxitL5R4=; b=A1Z1h+MOagV2Ej6ZrQgh7ZrX0Nkg4FBiAuoeRJ3dqA4ikSioZVjSRP0ltgVtsSKp2U Z1ODzU5gQxRwkrdVId1U6N5g1lxbRSKDIqBIQ8T0Cii/bId9KtH9Amhnwji0G504DJbP XHodVccgogYSOJCdbvHO1H1SgKqy8fDnfqIxe4i2ZQh0dMTXdxhDdouWYJ+eOsY1NSqB mubAuJQKlp7MmzavUtbapJvhzZjNyOfw/XTlh/Qx3nD0DC6/9gM2AZ8IxYDoH5gf+jSG AFU3OsWjQ4WjpZDI8YZcm8i86dHYtJ+pW9B3UBcBlciweviKCPzS4Po5vCcV1SY0Mrn8 ggTQ== X-Gm-Message-State: AODbwcBFMXe7AZu3y8TrIVn7FOWJJPKz+Sunekm6vvcXnlsYwl81hAHF kf5sLAM8a4F51w== X-Received: by 10.223.161.144 with SMTP id u16mr23645853wru.145.1495733323989; Thu, 25 May 2017 10:28:43 -0700 (PDT) Received: from norris-440-G3 ([5.134.110.254]) by smtp.gmail.com with ESMTPSA id e83sm10494852wmc.28.2017.05.25.10.28.43 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 May 2017 10:28:43 -0700 (PDT) From: Marko Stankovic To: Aditya Shankar , Ganesh Krishna , Greg Kroah-Hartman Cc: Marko Stankovic , linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH 1/2] staging: wilc1000: remove excessive blank lines Date: Thu, 25 May 2017 19:28:30 +0200 Message-Id: <20170525172831.14596-1-dartnorris@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix the multiple blank lines issue reported by checkpatch.pl Signed-off-by: Marko Stankovic --- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 807aada308e3..98316a45abd1 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -84,7 +84,6 @@ static const struct wiphy_wowlan_support wowlan_support = { #define TCP_ACK_FILTER_LINK_SPEED_THRESH 54 #define DEFAULT_LINK_SPEED 72 - #define IS_MANAGMEMENT 0x100 #define IS_MANAGMEMENT_CALLBACK 0x080 #define IS_MGMT_STATUS_SUCCES 0x040 @@ -163,7 +162,6 @@ static struct ieee80211_supported_band WILC_WFI_band_2ghz = { .n_bitrates = ARRAY_SIZE(ieee80211_bitrates), }; - struct add_key_params { u8 key_idx; bool pairwise; @@ -281,7 +279,6 @@ static void remove_network_from_shadow(unsigned long arg) unsigned long now = jiffies; int i, j; - for (i = 0; i < last_scanned_cnt; i++) { if (time_after(now, last_scanned_shadow[i].time_scan + (unsigned long)(SCAN_RESULT_EXPIRE))) { @@ -526,7 +523,6 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent, memcpy(priv->au8AssociatedBss, pstrConnectInfo->bssid, ETH_ALEN); - for (i = 0; i < last_scanned_cnt; i++) { if (memcmp(last_scanned_shadow[i].bssid, pstrConnectInfo->bssid, @@ -626,7 +622,6 @@ static int scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) return -ENOMEM; strHiddenNetwork.n_ssids = request->n_ssids; - for (i = 0; i < request->n_ssids; i++) { if (request->ssids[i].ssid_len != 0) { strHiddenNetwork.net_info[i].ssid = kmalloc(request->ssids[i].ssid_len, GFP_KERNEL); @@ -927,8 +922,6 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, priv->wilc_ptk[key_index]->seq = NULL; } - - if (!pairwise) { if (params->cipher == WLAN_CIPHER_SUITE_TKIP) u8gmode = ENCRYPT_ENABLED | WPA | TKIP; @@ -968,7 +961,6 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, else u8pmode = priv->wilc_groupkey | AES; - if (params->key_len > 16 && params->cipher == WLAN_CIPHER_SUITE_TKIP) { pu8TxMic = params->key + 24; pu8RxMic = params->key + 16; @@ -1153,7 +1145,6 @@ static int get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, priv = wiphy_priv(wiphy); - if (!pairwise) { key_params.key = priv->wilc_gtk[key_index]->key; key_params.cipher = priv->wilc_gtk[key_index]->cipher; @@ -1298,7 +1289,6 @@ static int set_pmksa(struct wiphy *wiphy, struct net_device *netdev, vif = netdev_priv(priv->dev); - for (i = 0; i < priv->pmkid_list.numpmkid; i++) { if (!memcmp(pmksa->bssid, priv->pmkid_list.pmkidlist[i].bssid, ETH_ALEN)) { @@ -1511,7 +1501,6 @@ void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size) } } - if ((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP) && (wilc_ie)) { cfg80211_rx_mgmt(priv->wdev, s32Freq, 0, buff, size - 7, 0); return; @@ -1533,7 +1522,6 @@ static void WILC_WFI_mgmt_tx_complete(void *priv, int status) { struct p2p_mgmt_data *pv_data = priv; - kfree(pv_data->buff); kfree(pv_data); } @@ -1653,7 +1641,6 @@ static int mgmt_tx(struct wiphy *wiphy, memcpy(mgmt_tx->buff, buf, len); mgmt_tx->size = len; - if (ieee80211_is_probe_resp(mgmt->frame_control)) { wilc_set_mac_chnl_num(vif, chan->hw_value); curr_channel = chan->hw_value; @@ -1832,7 +1819,6 @@ static int set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, if (wilc_enable_ps) wilc_set_power_mgmt(vif, enabled, timeout); - return 0; } @@ -2094,7 +2080,6 @@ static struct wireless_dev *add_virtual_intf(struct wiphy *wiphy, priv = wiphy_priv(wiphy); vif = netdev_priv(priv->wdev->netdev); - if (type == NL80211_IFTYPE_MONITOR) { new_ifc = WILC_WFI_init_mon_interface(name, vif->ndev); if (new_ifc) {