From patchwork Tue May 31 05:58:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirtika Ruchandani X-Patchwork-Id: 9143321 X-Patchwork-Delegate: johannes@sipsolutions.net 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 B8D6C60757 for ; Tue, 31 May 2016 05:59:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACFE627D17 for ; Tue, 31 May 2016 05:59:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1A15281C1; Tue, 31 May 2016 05:59:52 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 F04A127D17 for ; Tue, 31 May 2016 05:59:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752071AbcEaF72 (ORCPT ); Tue, 31 May 2016 01:59:28 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33187 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751176AbcEaF70 (ORCPT ); Tue, 31 May 2016 01:59:26 -0400 Received: by mail-pf0-f194.google.com with SMTP id b124so24169589pfb.0; Mon, 30 May 2016 22:59:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=YIlGT/qDvNGiaR/Rw2kdzOyfJe0Uim+O0HHS6IOSxiI=; b=W51ZIrgE8bGe84zJwHYRobvSNk+xiYK6VVbWytlwoPvLuY+mrkrR164d09Iz+LJsbV lidCiGVmLc8eaFP45bEtNG6lVH2dbKXzf1LVWzqSpvVeO+0SeIvGdQ5QcRuQMp13oIdd j9dyRyfG0mWYK/2bxMF4Ejai+u3ReAamfFQr8RNxkk1Ctv+514MeQd9tixeIgPOFLMOp y9E3oeeAILvF+DyPQjBYlbW6KhVwNoysTyyWgdRQbmBNrQo49TGXd0y5QZCt4j4Dj3n4 g8+qc9W03vfa8/hED+q6cOrX9eyCnqCuOfZeBflHk5fA88MY3vc8fZTordTJxF51YInQ x0JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=YIlGT/qDvNGiaR/Rw2kdzOyfJe0Uim+O0HHS6IOSxiI=; b=BVhJKgBPxATVlxzSTGZ+AZhhdO2QjaOZWyfNORHD2SNWcHar6sc+Lv5scLJwG26xo7 eX20iFmLkcAQEmo0SPd6f2hlqsR2xB/qEO3UcUR+KGRuhpi2z4pFLV4EO3XUWu0gwVJs PZDBNgebTNnzW6p7T7L2izHneqYE0KYtkZHXS88U+Ige3rL5o8swJz66c6Mx79GP7Te+ GgQpkEcqVzNArGMJlJKIPpLXYCrVF9MSRLV2FcbuOR2MKS7mDF/Khjh2firhLpWJQXWl Rx7wZVRGuBhC/7M/1P6hUSdj8bvtxOCmoHsMex0+vzHYmDiYj9nKoYXHbUSgl5oMD9Fm F90w== X-Gm-Message-State: ALyK8tIEzo9oUvPwOqGEp1fRxMi/b10XeF45FYuXlrjSh5p5JCuDGeBWo180aCMmHKX9qA== X-Received: by 10.98.58.156 with SMTP id v28mr52320584pfj.137.1464674365425; Mon, 30 May 2016 22:59:25 -0700 (PDT) Received: from google.com ([2620:0:1000:1301:34a5:2866:d018:587a]) by smtp.gmail.com with ESMTPSA id hk7sm51529182pad.25.2016.05.30.22.59.24 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 May 2016 22:59:24 -0700 (PDT) Date: Mon, 30 May 2016 22:58:58 -0700 From: Kirtika Ruchandani To: Johannes Berg Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, davem@davemloft.net Subject: [PATCH] net/wireless: Fix 'multiple blank lines' check Message-ID: <20160531055858.GA32239@google.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) 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 This patch fixes the checkpatch.pl check "Please don't use multiple blank lines" for all files in net/wireless, except nl80211.c which is covered in a separated patch. Signed-off-by: Kirtika Ruchandani Reviewed-by: Julian Calaby --- net/wireless/ap.c | 1 - net/wireless/chan.c | 3 --- net/wireless/core.h | 2 -- net/wireless/ibss.c | 1 - net/wireless/mlme.c | 2 -- net/wireless/radiotap.c | 2 -- net/wireless/rdev-ops.h | 2 -- net/wireless/reg.c | 3 --- net/wireless/scan.c | 1 - net/wireless/sme.c | 1 - net/wireless/util.c | 2 -- net/wireless/wext-compat.c | 3 --- net/wireless/wext-compat.h | 2 -- net/wireless/wext-core.c | 6 ------ net/wireless/wext-proc.c | 1 - net/wireless/wext-sme.c | 1 - 16 files changed, 33 deletions(-) -- 2.8.0.rc3.226.g39d4020 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/wireless/ap.c b/net/wireless/ap.c index bdad1f9..23acf58 100644 --- a/net/wireless/ap.c +++ b/net/wireless/ap.c @@ -5,7 +5,6 @@ #include "core.h" #include "rdev-ops.h" - int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev, struct net_device *dev, bool notify) { diff --git a/net/wireless/chan.c b/net/wireless/chan.c index da49c0b..34cec73d 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -325,7 +325,6 @@ static int cfg80211_get_chans_dfs_required(struct wiphy *wiphy, return 0; } - int cfg80211_chandef_dfs_required(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef, enum nl80211_iftype iftype) @@ -455,7 +454,6 @@ bool cfg80211_chandef_dfs_usable(struct wiphy *wiphy, return (r1 + r2 > 0); } - static bool cfg80211_get_chans_dfs_available(struct wiphy *wiphy, u32 center_freq, u32 bandwidth) @@ -685,7 +683,6 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy, if (width < 20) prohibited_flags |= IEEE80211_CHAN_NO_OFDM; - if (!cfg80211_secondary_chans_ok(wiphy, chandef->center_freq1, width, prohibited_flags)) return false; diff --git a/net/wireless/core.h b/net/wireless/core.h index 025b7a5..5c54a1e 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -16,7 +16,6 @@ #include #include "reg.h" - #define WIPHY_IDX_INVALID -1 struct cfg80211_registered_device { @@ -161,7 +160,6 @@ static inline void cfg80211_unhold_bss(struct cfg80211_internal_bss *bss) WARN_ON(r < 0); } - struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx); int get_wiphy_idx(struct wiphy *wiphy); diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index 4a4dda5..67b4f9b 100644 --- a/net/wireless/ibss.c +++ b/net/wireless/ibss.c @@ -13,7 +13,6 @@ #include "nl80211.h" #include "rdev-ops.h" - void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, struct ieee80211_channel *channel) { diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index c284d88..332a143 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c @@ -18,7 +18,6 @@ #include "nl80211.h" #include "rdev-ops.h" - void cfg80211_rx_assoc_resp(struct net_device *dev, struct cfg80211_bss *bss, const u8 *buf, size_t len, int uapsd_queues) { @@ -768,7 +767,6 @@ void cfg80211_dfs_channels_update_work(struct work_struct *work) next_time); } - void cfg80211_radar_event(struct wiphy *wiphy, struct cfg80211_chan_def *chandef, gfp_t gfp) diff --git a/net/wireless/radiotap.c b/net/wireless/radiotap.c index 6582d15..f193b88 100644 --- a/net/wireless/radiotap.c +++ b/net/wireless/radiotap.c @@ -184,8 +184,6 @@ static void find_ns(struct ieee80211_radiotap_iterator *iterator, } } - - /** * ieee80211_radiotap_iterator_next - return next radiotap parser iterator arg * @iterator: radiotap_iterator to move to next arg (if any) diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h index 85ff30b..9ad56db 100644 --- a/net/wireless/rdev-ops.h +++ b/net/wireless/rdev-ops.h @@ -338,7 +338,6 @@ static inline int rdev_join_mesh(struct cfg80211_registered_device *rdev, return ret; } - static inline int rdev_leave_mesh(struct cfg80211_registered_device *rdev, struct net_device *dev) { @@ -569,7 +568,6 @@ static inline void rdev_rfkill_poll(struct cfg80211_registered_device *rdev) trace_rdev_return_void(&rdev->wiphy); } - #ifdef CONFIG_NL80211_TESTMODE static inline int rdev_testmode_cmd(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev, diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 5dbac37..cfd4d69 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -18,7 +18,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - /** * DOC: Wireless regulatory infrastructure * @@ -1969,7 +1968,6 @@ reg_process_hint_driver(struct wiphy *wiphy, rcu_free_regdom(tmp); } - driver_request->intersect = treatment == REG_REQ_INTERSECT; driver_request->processed = false; @@ -2715,7 +2713,6 @@ static void print_rd_rules(const struct ieee80211_regdomain *rd) else scnprintf(cac_time, sizeof(cac_time), "N/A"); - /* * There may not be documentation for max antenna gain * in certain regions diff --git a/net/wireless/scan.c b/net/wireless/scan.c index ef2955c..fb121ca 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -1622,7 +1622,6 @@ ieee80211_bss(struct wiphy *wiphy, struct iw_request_info *info, return current_ev; } - static int ieee80211_scan_results(struct cfg80211_registered_device *rdev, struct iw_request_info *info, char *buf, size_t len) diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 584fdc3..2c39dc5a 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -638,7 +638,6 @@ static void disconnect_work(struct work_struct *work) static DECLARE_WORK(cfg80211_disconnect_work, disconnect_work); - /* * API calls for drivers implementing connect/disconnect and * SME event handling diff --git a/net/wireless/util.c b/net/wireless/util.c index 4e809e9..8f246c1 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -16,7 +16,6 @@ #include "core.h" #include "rdev-ops.h" - struct ieee80211_rate * ieee80211_get_response_rate(struct ieee80211_supported_band *sband, u32 basic_rates, int bitrate) @@ -1310,7 +1309,6 @@ int cfg80211_get_p2p_attr(const u8 *ies, unsigned int len, bufsize -= min(bufsize, copy); } - if (copy == attr_remaining) return desired_len; } diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index 9f27221..e9b724a 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c @@ -101,7 +101,6 @@ int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info, } EXPORT_WEXT_HANDLER(cfg80211_wext_giwmode); - int cfg80211_wext_giwrange(struct net_device *dev, struct iw_request_info *info, struct iw_point *data, char *extra) @@ -215,7 +214,6 @@ int cfg80211_wext_giwrange(struct net_device *dev, } EXPORT_WEXT_HANDLER(cfg80211_wext_giwrange); - /** * cfg80211_wext_freq - get wext frequency for non-"auto" * @dev: the net device @@ -1013,7 +1011,6 @@ static int cfg80211_set_cipher_pairwise(struct wireless_dev *wdev, u32 cipher) return 0; } - static int cfg80211_set_key_mgt(struct wireless_dev *wdev, u32 key_mgt) { int nr_akm_suites = 0; diff --git a/net/wireless/wext-compat.h b/net/wireless/wext-compat.h index 94c7405..4d6af53 100644 --- a/net/wireless/wext-compat.h +++ b/net/wireless/wext-compat.h @@ -55,9 +55,7 @@ int cfg80211_wext_siwgenie(struct net_device *dev, struct iw_request_info *info, struct iw_point *data, char *extra); - int cfg80211_wext_freq(struct iw_freq *freq); - extern const struct iw_handler_def cfg80211_wext_handler; #endif /* __WEXT_COMPAT */ diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c index 6250b1c..1cbbe7c 100644 --- a/net/wireless/wext-core.c +++ b/net/wireless/wext-core.c @@ -24,7 +24,6 @@ typedef int (*wext_ioctl_func)(struct net_device *, struct iwreq *, unsigned int, struct iw_request_info *, iw_handler); - /* * Meta-data about all the standard Wireless Extension request we * know about. @@ -339,7 +338,6 @@ static const int compat_event_type_size[] = { }; #endif - /* IW event code */ void wireless_nlevent_flush(void) @@ -444,7 +442,6 @@ static struct nlmsghdr *rtnetlink_ifinfo_prep(struct net_device *dev, return NULL; } - /* * Main event dispatcher. Called from other parts and drivers. * Send the event on the appropriate channels. @@ -635,8 +632,6 @@ void wireless_send_event(struct net_device * dev, } EXPORT_SYMBOL(wireless_send_event); - - /* IW handlers */ struct iw_statistics *get_wireless_stats(struct net_device *dev) @@ -1038,7 +1033,6 @@ static int ioctl_standard_call(struct net_device * dev, return ret; } - int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd, void __user *arg) { diff --git a/net/wireless/wext-proc.c b/net/wireless/wext-proc.c index e98a01c..3356c1b 100644 --- a/net/wireless/wext-proc.c +++ b/net/wireless/wext-proc.c @@ -25,7 +25,6 @@ #include #include - static void wireless_seq_printf_stats(struct seq_file *seq, struct net_device *dev) { diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c index a4e8af3..8b8e468 100644 --- a/net/wireless/wext-sme.c +++ b/net/wireless/wext-sme.c @@ -106,7 +106,6 @@ int cfg80211_mgd_wext_siwfreq(struct net_device *dev, goto out; } - wdev->wext.connect.channel = chan; /*