aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalle Valo <kvalo@qca.qualcomm.com>2014-09-14 05:50:11 -0400
committerKalle Valo <kvalo@qca.qualcomm.com>2014-09-18 03:45:20 -0400
commitc6e2e60e858efa8dd92d94f5d442068fb12b9967 (patch)
tree8ffe282ae75f818b49dac457aa4960bb6113f173
parent5b07e07fd0a9432b6910badfdb084112be4390af (diff)
ath10k: fix use of multiple blank lines
Fixes checkpatch warnings: CHECK: Please don't use multiple blank lines Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/ath10k/bmi.h1
-rw-r--r--drivers/net/wireless/ath/ath10k/ce.c2
-rw-r--r--drivers/net/wireless/ath/ath10k/ce.h3
-rw-r--r--drivers/net/wireless/ath/ath10k/hif.h1
-rw-r--r--drivers/net/wireless/ath/ath10k/htc.h1
-rw-r--r--drivers/net/wireless/ath/ath10k/htt.h2
-rw-r--r--drivers/net/wireless/ath/ath10k/htt_rx.c1
-rw-r--r--drivers/net/wireless/ath/ath10k/htt_tx.c1
-rw-r--r--drivers/net/wireless/ath/ath10k/mac.c4
-rw-r--r--drivers/net/wireless/ath/ath10k/rx_desc.h1
-rw-r--r--drivers/net/wireless/ath/ath10k/targaddrs.h1
-rw-r--r--drivers/net/wireless/ath/ath10k/wmi.c2
-rw-r--r--drivers/net/wireless/ath/ath10k/wmi.h9
13 files changed, 0 insertions, 29 deletions
diff --git a/drivers/net/wireless/ath/ath10k/bmi.h b/drivers/net/wireless/ath/ath10k/bmi.h
index 111ab701465c..31a990635490 100644
--- a/drivers/net/wireless/ath/ath10k/bmi.h
+++ b/drivers/net/wireless/ath/ath10k/bmi.h
@@ -177,7 +177,6 @@ struct bmi_target_info {
177 u32 type; 177 u32 type;
178}; 178};
179 179
180
181/* in msec */ 180/* in msec */
182#define BMI_COMMUNICATION_TIMEOUT_HZ (1*HZ) 181#define BMI_COMMUNICATION_TIMEOUT_HZ (1*HZ)
183 182
diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
index 71eef233bd01..101cadb6e4ba 100644
--- a/drivers/net/wireless/ath/ath10k/ce.c
+++ b/drivers/net/wireless/ath/ath10k/ce.c
@@ -260,7 +260,6 @@ static inline void ath10k_ce_engine_int_status_clear(struct ath10k *ar,
260 ath10k_pci_write32(ar, ce_ctrl_addr + HOST_IS_ADDRESS, mask); 260 ath10k_pci_write32(ar, ce_ctrl_addr + HOST_IS_ADDRESS, mask);
261} 261}
262 262
263
264/* 263/*
265 * Guts of ath10k_ce_send, used by both ath10k_ce_send and 264 * Guts of ath10k_ce_send, used by both ath10k_ce_send and
266 * ath10k_ce_sendlist_send. 265 * ath10k_ce_sendlist_send.
@@ -385,7 +384,6 @@ int ath10k_ce_num_free_src_entries(struct ath10k_ce_pipe *pipe)
385 return delta; 384 return delta;
386} 385}
387 386
388
389int __ath10k_ce_rx_num_free_bufs(struct ath10k_ce_pipe *pipe) 387int __ath10k_ce_rx_num_free_bufs(struct ath10k_ce_pipe *pipe)
390{ 388{
391 struct ath10k *ar = pipe->ar; 389 struct ath10k *ar = pipe->ar;
diff --git a/drivers/net/wireless/ath/ath10k/ce.h b/drivers/net/wireless/ath/ath10k/ce.h
index ad4fa7eb945f..329b7340fa72 100644
--- a/drivers/net/wireless/ath/ath10k/ce.h
+++ b/drivers/net/wireless/ath/ath10k/ce.h
@@ -20,7 +20,6 @@
20 20
21#include "hif.h" 21#include "hif.h"
22 22
23
24/* Maximum number of Copy Engine's supported */ 23/* Maximum number of Copy Engine's supported */
25#define CE_COUNT_MAX 8 24#define CE_COUNT_MAX 8
26#define CE_HTT_H2T_MSG_SRC_NENTRIES 4096 25#define CE_HTT_H2T_MSG_SRC_NENTRIES 4096
@@ -37,7 +36,6 @@
37 36
38struct ath10k_ce_pipe; 37struct ath10k_ce_pipe;
39 38
40
41#define CE_DESC_FLAGS_GATHER (1 << 0) 39#define CE_DESC_FLAGS_GATHER (1 << 0)
42#define CE_DESC_FLAGS_BYTE_SWAP (1 << 1) 40#define CE_DESC_FLAGS_BYTE_SWAP (1 << 1)
43#define CE_DESC_FLAGS_META_DATA_MASK 0xFFFC 41#define CE_DESC_FLAGS_META_DATA_MASK 0xFFFC
@@ -383,7 +381,6 @@ struct ce_attr {
383#define DST_WATERMARK_HIGH_RESET 0 381#define DST_WATERMARK_HIGH_RESET 0
384#define DST_WATERMARK_ADDRESS 0x0050 382#define DST_WATERMARK_ADDRESS 0x0050
385 383
386
387static inline u32 ath10k_ce_base_address(unsigned int ce_id) 384static inline u32 ath10k_ce_base_address(unsigned int ce_id)
388{ 385{
389 return CE0_BASE_ADDRESS + (CE1_BASE_ADDRESS - CE0_BASE_ADDRESS) * ce_id; 386 return CE0_BASE_ADDRESS + (CE1_BASE_ADDRESS - CE0_BASE_ADDRESS) * ce_id;
diff --git a/drivers/net/wireless/ath/ath10k/hif.h b/drivers/net/wireless/ath/ath10k/hif.h
index 2ac7beacddca..62323fea27e1 100644
--- a/drivers/net/wireless/ath/ath10k/hif.h
+++ b/drivers/net/wireless/ath/ath10k/hif.h
@@ -91,7 +91,6 @@ struct ath10k_hif_ops {
91 int (*resume)(struct ath10k *ar); 91 int (*resume)(struct ath10k *ar);
92}; 92};
93 93
94
95static inline int ath10k_hif_tx_sg(struct ath10k *ar, u8 pipe_id, 94static inline int ath10k_hif_tx_sg(struct ath10k *ar, u8 pipe_id,
96 struct ath10k_hif_sg_item *items, 95 struct ath10k_hif_sg_item *items,
97 int n_items) 96 int n_items)
diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
index bf532f671189..527179c0edce 100644
--- a/drivers/net/wireless/ath/ath10k/htc.h
+++ b/drivers/net/wireless/ath/ath10k/htc.h
@@ -214,7 +214,6 @@ struct ath10k_htc_frame {
214 struct ath10k_htc_record trailer[0]; 214 struct ath10k_htc_record trailer[0];
215} __packed __aligned(4); 215} __packed __aligned(4);
216 216
217
218/*******************/ 217/*******************/
219/* Host-side stuff */ 218/* Host-side stuff */
220/*******************/ 219/*******************/
diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index 6c93f3885ee5..e20472672efe 100644
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -265,7 +265,6 @@ enum htt_mgmt_tx_status {
265 265
266/*=== target -> host messages ===============================================*/ 266/*=== target -> host messages ===============================================*/
267 267
268
269enum htt_t2h_msg_type { 268enum htt_t2h_msg_type {
270 HTT_T2H_MSG_TYPE_VERSION_CONF = 0x0, 269 HTT_T2H_MSG_TYPE_VERSION_CONF = 0x0,
271 HTT_T2H_MSG_TYPE_RX_IND = 0x1, 270 HTT_T2H_MSG_TYPE_RX_IND = 0x1,
@@ -1148,7 +1147,6 @@ struct htt_resp {
1148 }; 1147 };
1149} __packed; 1148} __packed;
1150 1149
1151
1152/*** host side structures follow ***/ 1150/*** host side structures follow ***/
1153 1151
1154struct htt_tx_done { 1152struct htt_tx_done {
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index a720de3d20c4..1e69db52e465 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -42,7 +42,6 @@
42/* when under memory pressure rx ring refill may fail and needs a retry */ 42/* when under memory pressure rx ring refill may fail and needs a retry */
43#define HTT_RX_RING_REFILL_RETRY_MS 50 43#define HTT_RX_RING_REFILL_RETRY_MS 50
44 44
45
46static int ath10k_htt_rx_get_csum_state(struct sk_buff *skb); 45static int ath10k_htt_rx_get_csum_state(struct sk_buff *skb);
47static void ath10k_htt_txrx_compl_task(unsigned long ptr); 46static void ath10k_htt_txrx_compl_task(unsigned long ptr);
48 47
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index eaa73aa99c20..1ab64631ba1b 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -377,7 +377,6 @@ int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *msdu)
377 int msdu_id = -1; 377 int msdu_id = -1;
378 int res; 378 int res;
379 379
380
381 res = ath10k_htt_tx_inc_pending(htt); 380 res = ath10k_htt_tx_inc_pending(htt);
382 if (res) 381 if (res)
383 goto err; 382 goto err;
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index bd852078a413..75b30adfd367 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -225,7 +225,6 @@ static int ath10k_clear_vdev_key(struct ath10k_vif *arvif,
225 return first_errno; 225 return first_errno;
226} 226}
227 227
228
229/*********************/ 228/*********************/
230/* General utilities */ 229/* General utilities */
231/*********************/ 230/*********************/
@@ -1262,7 +1261,6 @@ static int ath10k_peer_assoc_qos_ap(struct ath10k *ar,
1262 uapsd |= WMI_AP_PS_UAPSD_AC0_DELIVERY_EN | 1261 uapsd |= WMI_AP_PS_UAPSD_AC0_DELIVERY_EN |
1263 WMI_AP_PS_UAPSD_AC0_TRIGGER_EN; 1262 WMI_AP_PS_UAPSD_AC0_TRIGGER_EN;
1264 1263
1265
1266 if (sta->max_sp < MAX_WMI_AP_PS_PEER_PARAM_MAX_SP) 1264 if (sta->max_sp < MAX_WMI_AP_PS_PEER_PARAM_MAX_SP)
1267 max_sp = sta->max_sp; 1265 max_sp = sta->max_sp;
1268 1266
@@ -1316,7 +1314,6 @@ static void ath10k_peer_assoc_h_vht(struct ath10k *ar,
1316 arg->peer_flags |= WMI_PEER_VHT; 1314 arg->peer_flags |= WMI_PEER_VHT;
1317 arg->peer_vht_caps = vht_cap->cap; 1315 arg->peer_vht_caps = vht_cap->cap;
1318 1316
1319
1320 ampdu_factor = (vht_cap->cap & 1317 ampdu_factor = (vht_cap->cap &
1321 IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK) >> 1318 IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK) >>
1322 IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT; 1319 IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;
@@ -4715,7 +4712,6 @@ static struct ieee80211_sta_ht_cap ath10k_get_ht_cap(struct ath10k *ar)
4715 return ht_cap; 4712 return ht_cap;
4716} 4713}
4717 4714
4718
4719static void ath10k_get_arvif_iter(void *data, u8 *mac, 4715static void ath10k_get_arvif_iter(void *data, u8 *mac,
4720 struct ieee80211_vif *vif) 4716 struct ieee80211_vif *vif)
4721{ 4717{
diff --git a/drivers/net/wireless/ath/ath10k/rx_desc.h b/drivers/net/wireless/ath/ath10k/rx_desc.h
index 1c584c4b019c..e1ffdd57a18c 100644
--- a/drivers/net/wireless/ath/ath10k/rx_desc.h
+++ b/drivers/net/wireless/ath/ath10k/rx_desc.h
@@ -839,7 +839,6 @@ struct rx_ppdu_start {
839 * Reserved: HW should fill with 0, FW should ignore. 839 * Reserved: HW should fill with 0, FW should ignore.
840*/ 840*/
841 841
842
843#define RX_PPDU_END_FLAGS_PHY_ERR (1 << 0) 842#define RX_PPDU_END_FLAGS_PHY_ERR (1 << 0)
844#define RX_PPDU_END_FLAGS_RX_LOCATION (1 << 1) 843#define RX_PPDU_END_FLAGS_RX_LOCATION (1 << 1)
845#define RX_PPDU_END_FLAGS_TXBF_H_INFO (1 << 2) 844#define RX_PPDU_END_FLAGS_TXBF_H_INFO (1 << 2)
diff --git a/drivers/net/wireless/ath/ath10k/targaddrs.h b/drivers/net/wireless/ath/ath10k/targaddrs.h
index be7ba1e78afe..9d0ae30f9ff1 100644
--- a/drivers/net/wireless/ath/ath10k/targaddrs.h
+++ b/drivers/net/wireless/ath/ath10k/targaddrs.h
@@ -284,7 +284,6 @@ Fw Mode/SubMode Mask
284#define HI_OPTION_ALL_FW_SUBMODE_MASK 0xFF00 284#define HI_OPTION_ALL_FW_SUBMODE_MASK 0xFF00
285#define HI_OPTION_ALL_FW_SUBMODE_SHIFT 0x8 285#define HI_OPTION_ALL_FW_SUBMODE_SHIFT 0x8
286 286
287
288/* hi_option_flag2 options */ 287/* hi_option_flag2 options */
289#define HI_OPTION_OFFLOAD_AMSDU 0x01 288#define HI_OPTION_OFFLOAD_AMSDU 0x01
290#define HI_OPTION_DFS_SUPPORT 0x02 /* Enable DFS support */ 289#define HI_OPTION_DFS_SUPPORT 0x02 /* Enable DFS support */
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 3b5749d8b081..ed438edb9763 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -1511,7 +1511,6 @@ static u32 ath10k_p2p_calc_noa_ie_len(struct wmi_p2p_noa_info *noa)
1511 u8 opp_ps_info = noa->ctwindow_oppps; 1511 u8 opp_ps_info = noa->ctwindow_oppps;
1512 bool opps_enabled = !!(opp_ps_info & WMI_P2P_OPPPS_ENABLE_BIT); 1512 bool opps_enabled = !!(opp_ps_info & WMI_P2P_OPPPS_ENABLE_BIT);
1513 1513
1514
1515 if (!noa_descriptors && !opps_enabled) 1514 if (!noa_descriptors && !opps_enabled)
1516 return len; 1515 return len;
1517 1516
@@ -1568,7 +1567,6 @@ cleanup:
1568 kfree(old_data); 1567 kfree(old_data);
1569} 1568}
1570 1569
1571
1572static void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb) 1570static void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb)
1573{ 1571{
1574 struct wmi_host_swba_event *ev; 1572 struct wmi_host_swba_event *ev;
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index 1cc594e18a07..86f5ebccfe79 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -1269,7 +1269,6 @@ enum wmi_channel_change_cause {
1269 WMI_HT_CAP_RX_STBC | \ 1269 WMI_HT_CAP_RX_STBC | \
1270 WMI_HT_CAP_LDPC) 1270 WMI_HT_CAP_LDPC)
1271 1271
1272
1273/* 1272/*
1274 * WMI_VHT_CAP_* these maps to ieee 802.11ac vht capability information 1273 * WMI_VHT_CAP_* these maps to ieee 802.11ac vht capability information
1275 * field. The fields not defined here are not supported, or reserved. 1274 * field. The fields not defined here are not supported, or reserved.
@@ -1471,7 +1470,6 @@ struct wmi_service_ready_event_10x {
1471 struct wlan_host_mem_req mem_reqs[1]; 1470 struct wlan_host_mem_req mem_reqs[1];
1472} __packed; 1471} __packed;
1473 1472
1474
1475#define WMI_SERVICE_READY_TIMEOUT_HZ (5*HZ) 1473#define WMI_SERVICE_READY_TIMEOUT_HZ (5*HZ)
1476#define WMI_UNIFIED_READY_TIMEOUT_HZ (5*HZ) 1474#define WMI_UNIFIED_READY_TIMEOUT_HZ (5*HZ)
1477 1475
@@ -2125,7 +2123,6 @@ struct wmi_start_scan_cmd_10x {
2125 */ 2123 */
2126} __packed; 2124} __packed;
2127 2125
2128
2129struct wmi_ssid_arg { 2126struct wmi_ssid_arg {
2130 int len; 2127 int len;
2131 const u8 *ssid; 2128 const u8 *ssid;
@@ -2186,7 +2183,6 @@ struct wmi_start_scan_arg {
2186/* WMI_SCAN_CLASS_MASK must be the same value as IEEE80211_SCAN_CLASS_MASK */ 2183/* WMI_SCAN_CLASS_MASK must be the same value as IEEE80211_SCAN_CLASS_MASK */
2187#define WMI_SCAN_CLASS_MASK 0xFF000000 2184#define WMI_SCAN_CLASS_MASK 0xFF000000
2188 2185
2189
2190enum wmi_stop_scan_type { 2186enum wmi_stop_scan_type {
2191 WMI_SCAN_STOP_ONE = 0x00000000, /* stop by scan_id */ 2187 WMI_SCAN_STOP_ONE = 0x00000000, /* stop by scan_id */
2192 WMI_SCAN_STOP_VDEV_ALL = 0x01000000, /* stop by vdev_id */ 2188 WMI_SCAN_STOP_VDEV_ALL = 0x01000000, /* stop by vdev_id */
@@ -2371,7 +2367,6 @@ struct wmi_single_phyerr_rx_hdr {
2371 __le32 nf_list_1; 2367 __le32 nf_list_1;
2372 __le32 nf_list_2; 2368 __le32 nf_list_2;
2373 2369
2374
2375 /* Length of the frame */ 2370 /* Length of the frame */
2376 __le32 buf_len; 2371 __le32 buf_len;
2377} __packed; 2372} __packed;
@@ -2473,7 +2468,6 @@ struct phyerr_fft_report {
2473#define SEARCH_FFT_REPORT_REG1_NUM_STR_BINS_IB_MASK 0x000000FF 2468#define SEARCH_FFT_REPORT_REG1_NUM_STR_BINS_IB_MASK 0x000000FF
2474#define SEARCH_FFT_REPORT_REG1_NUM_STR_BINS_IB_LSB 0 2469#define SEARCH_FFT_REPORT_REG1_NUM_STR_BINS_IB_LSB 0
2475 2470
2476
2477struct phyerr_tlv { 2471struct phyerr_tlv {
2478 __le16 len; 2472 __le16 len;
2479 u8 tag; 2473 u8 tag;
@@ -2504,7 +2498,6 @@ struct wmi_echo_cmd {
2504 __le32 value; 2498 __le32 value;
2505} __packed; 2499} __packed;
2506 2500
2507
2508struct wmi_pdev_set_regdomain_cmd { 2501struct wmi_pdev_set_regdomain_cmd {
2509 __le32 reg_domain; 2502 __le32 reg_domain;
2510 __le32 reg_domain_2G; 2503 __le32 reg_domain_2G;
@@ -2553,7 +2546,6 @@ struct wmi_pdev_set_quiet_cmd {
2553 __le32 enabled; 2546 __le32 enabled;
2554} __packed; 2547} __packed;
2555 2548
2556
2557/* 2549/*
2558 * 802.11g protection mode. 2550 * 802.11g protection mode.
2559 */ 2551 */
@@ -4291,7 +4283,6 @@ struct wmi_tbtt_offset_event {
4291 __le32 tbttoffset_list[WMI_MAX_AP_VDEV]; 4283 __le32 tbttoffset_list[WMI_MAX_AP_VDEV];
4292} __packed; 4284} __packed;
4293 4285
4294
4295struct wmi_peer_create_cmd { 4286struct wmi_peer_create_cmd {
4296 __le32 vdev_id; 4287 __le32 vdev_id;
4297 struct wmi_mac_addr peer_macaddr; 4288 struct wmi_mac_addr peer_macaddr;