diff options
author | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-09-14 05:50:06 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-09-18 03:41:18 -0400 |
commit | 5b07e07fd0a9432b6910badfdb084112be4390af (patch) | |
tree | 8057f8897d81428ad44b89d9b8c12fd9a9b44792 | |
parent | bd8bdbb6902491518f36491a6bac9b6e2cdb0b60 (diff) |
ath10k: fix checkpatch warnings about parenthesis alignment
CHECK: Alignment should match open parenthesis
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r-- | drivers/net/wireless/ath/ath10k/ce.h | 10 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath10k/debug.c | 15 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath10k/htc.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath10k/htt.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath10k/htt_rx.c | 12 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath10k/mac.c | 13 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath10k/pci.c | 14 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath10k/wmi.c | 30 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath10k/wmi.h | 8 |
9 files changed, 55 insertions, 51 deletions
diff --git a/drivers/net/wireless/ath/ath10k/ce.h b/drivers/net/wireless/ath/ath10k/ce.h index 82d1f23546b9..ad4fa7eb945f 100644 --- a/drivers/net/wireless/ath/ath10k/ce.h +++ b/drivers/net/wireless/ath/ath10k/ce.h | |||
@@ -189,10 +189,10 @@ int ath10k_ce_completed_recv_next(struct ath10k_ce_pipe *ce_state, | |||
189 | * Pops 1 completed send buffer from Source ring. | 189 | * Pops 1 completed send buffer from Source ring. |
190 | */ | 190 | */ |
191 | int ath10k_ce_completed_send_next(struct ath10k_ce_pipe *ce_state, | 191 | int ath10k_ce_completed_send_next(struct ath10k_ce_pipe *ce_state, |
192 | void **per_transfer_contextp, | 192 | void **per_transfer_contextp, |
193 | u32 *bufferp, | 193 | u32 *bufferp, |
194 | unsigned int *nbytesp, | 194 | unsigned int *nbytesp, |
195 | unsigned int *transfer_idp); | 195 | unsigned int *transfer_idp); |
196 | 196 | ||
197 | /*==================CE Engine Initialization=======================*/ | 197 | /*==================CE Engine Initialization=======================*/ |
198 | 198 | ||
@@ -202,7 +202,7 @@ int ath10k_ce_init_pipe(struct ath10k *ar, unsigned int ce_id, | |||
202 | void (*recv_cb)(struct ath10k_ce_pipe *)); | 202 | void (*recv_cb)(struct ath10k_ce_pipe *)); |
203 | void ath10k_ce_deinit_pipe(struct ath10k *ar, unsigned int ce_id); | 203 | void ath10k_ce_deinit_pipe(struct ath10k *ar, unsigned int ce_id); |
204 | int ath10k_ce_alloc_pipe(struct ath10k *ar, int ce_id, | 204 | int ath10k_ce_alloc_pipe(struct ath10k *ar, int ce_id, |
205 | const struct ce_attr *attr); | 205 | const struct ce_attr *attr); |
206 | void ath10k_ce_free_pipe(struct ath10k *ar, int ce_id); | 206 | void ath10k_ce_free_pipe(struct ath10k *ar, int ce_id); |
207 | 207 | ||
208 | /*==================CE Engine Shutdown=======================*/ | 208 | /*==================CE Engine Shutdown=======================*/ |
diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index c1921143a870..2bfd00b29204 100644 --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c | |||
@@ -645,7 +645,8 @@ static ssize_t ath10k_write_simulate_fw_crash(struct file *file, | |||
645 | * firmware variants in order to force a firmware crash. | 645 | * firmware variants in order to force a firmware crash. |
646 | */ | 646 | */ |
647 | ret = ath10k_wmi_vdev_set_param(ar, 0x7fff, | 647 | ret = ath10k_wmi_vdev_set_param(ar, 0x7fff, |
648 | ar->wmi.vdev_param->rts_threshold, 0); | 648 | ar->wmi.vdev_param->rts_threshold, |
649 | 0); | ||
649 | } else if (!strcmp(buf, "assert")) { | 650 | } else if (!strcmp(buf, "assert")) { |
650 | ath10k_info(ar, "simulating firmware assert crash\n"); | 651 | ath10k_info(ar, "simulating firmware assert crash\n"); |
651 | ret = ath10k_debug_fw_assert(ar); | 652 | ret = ath10k_debug_fw_assert(ar); |
@@ -867,8 +868,8 @@ static void ath10k_debug_htt_stats_dwork(struct work_struct *work) | |||
867 | } | 868 | } |
868 | 869 | ||
869 | static ssize_t ath10k_read_htt_stats_mask(struct file *file, | 870 | static ssize_t ath10k_read_htt_stats_mask(struct file *file, |
870 | char __user *user_buf, | 871 | char __user *user_buf, |
871 | size_t count, loff_t *ppos) | 872 | size_t count, loff_t *ppos) |
872 | { | 873 | { |
873 | struct ath10k *ar = file->private_data; | 874 | struct ath10k *ar = file->private_data; |
874 | char buf[32]; | 875 | char buf[32]; |
@@ -880,8 +881,8 @@ static ssize_t ath10k_read_htt_stats_mask(struct file *file, | |||
880 | } | 881 | } |
881 | 882 | ||
882 | static ssize_t ath10k_write_htt_stats_mask(struct file *file, | 883 | static ssize_t ath10k_write_htt_stats_mask(struct file *file, |
883 | const char __user *user_buf, | 884 | const char __user *user_buf, |
884 | size_t count, loff_t *ppos) | 885 | size_t count, loff_t *ppos) |
885 | { | 886 | { |
886 | struct ath10k *ar = file->private_data; | 887 | struct ath10k *ar = file->private_data; |
887 | unsigned long mask; | 888 | unsigned long mask; |
@@ -986,8 +987,8 @@ static const struct file_operations fops_htt_max_amsdu_ampdu = { | |||
986 | }; | 987 | }; |
987 | 988 | ||
988 | static ssize_t ath10k_read_fw_dbglog(struct file *file, | 989 | static ssize_t ath10k_read_fw_dbglog(struct file *file, |
989 | char __user *user_buf, | 990 | char __user *user_buf, |
990 | size_t count, loff_t *ppos) | 991 | size_t count, loff_t *ppos) |
991 | { | 992 | { |
992 | struct ath10k *ar = file->private_data; | 993 | struct ath10k *ar = file->private_data; |
993 | unsigned int len; | 994 | unsigned int len; |
diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c index fd9a251f0659..b7ee24b19f59 100644 --- a/drivers/net/wireless/ath/ath10k/htc.c +++ b/drivers/net/wireless/ath/ath10k/htc.c | |||
@@ -569,7 +569,7 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc) | |||
569 | ath10k_hif_send_complete_check(htc->ar, i, 1); | 569 | ath10k_hif_send_complete_check(htc->ar, i, 1); |
570 | 570 | ||
571 | status = wait_for_completion_timeout(&htc->ctl_resp, | 571 | status = wait_for_completion_timeout(&htc->ctl_resp, |
572 | ATH10K_HTC_WAIT_TIMEOUT_HZ); | 572 | ATH10K_HTC_WAIT_TIMEOUT_HZ); |
573 | 573 | ||
574 | if (status == 0) | 574 | if (status == 0) |
575 | status = -ETIMEDOUT; | 575 | status = -ETIMEDOUT; |
diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c index 87daae11f116..56cb4aceb383 100644 --- a/drivers/net/wireless/ath/ath10k/htt.c +++ b/drivers/net/wireless/ath/ath10k/htt.c | |||
@@ -101,7 +101,7 @@ int ath10k_htt_setup(struct ath10k_htt *htt) | |||
101 | return status; | 101 | return status; |
102 | 102 | ||
103 | status = wait_for_completion_timeout(&htt->target_version_received, | 103 | status = wait_for_completion_timeout(&htt->target_version_received, |
104 | HTT_TARGET_VERSION_TIMEOUT_HZ); | 104 | HTT_TARGET_VERSION_TIMEOUT_HZ); |
105 | if (status <= 0) { | 105 | if (status <= 0) { |
106 | ath10k_warn(ar, "htt version request timed out\n"); | 106 | ath10k_warn(ar, "htt version request timed out\n"); |
107 | return -ETIMEDOUT; | 107 | return -ETIMEDOUT; |
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index 7313bd16a4b3..a720de3d20c4 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c | |||
@@ -626,7 +626,7 @@ static struct ieee80211_hdr *ath10k_htt_rx_skb_get_hdr(struct sk_buff *skb) | |||
626 | 626 | ||
627 | rxd = (void *)skb->data - sizeof(*rxd); | 627 | rxd = (void *)skb->data - sizeof(*rxd); |
628 | fmt = MS(__le32_to_cpu(rxd->msdu_start.info1), | 628 | fmt = MS(__le32_to_cpu(rxd->msdu_start.info1), |
629 | RX_MSDU_START_INFO1_DECAP_FORMAT); | 629 | RX_MSDU_START_INFO1_DECAP_FORMAT); |
630 | 630 | ||
631 | if (fmt == RX_MSDU_DECAP_RAW) | 631 | if (fmt == RX_MSDU_DECAP_RAW) |
632 | return (void *)skb->data; | 632 | return (void *)skb->data; |
@@ -915,7 +915,7 @@ static void ath10k_htt_rx_amsdu(struct ath10k_htt *htt, | |||
915 | 915 | ||
916 | rxd = (void *)skb->data - sizeof(*rxd); | 916 | rxd = (void *)skb->data - sizeof(*rxd); |
917 | enctype = MS(__le32_to_cpu(rxd->mpdu_start.info0), | 917 | enctype = MS(__le32_to_cpu(rxd->mpdu_start.info0), |
918 | RX_MPDU_START_INFO0_ENCRYPT_TYPE); | 918 | RX_MPDU_START_INFO0_ENCRYPT_TYPE); |
919 | 919 | ||
920 | hdr = (struct ieee80211_hdr *)rxd->rx_hdr_status; | 920 | hdr = (struct ieee80211_hdr *)rxd->rx_hdr_status; |
921 | hdr_len = ieee80211_hdrlen(hdr->frame_control); | 921 | hdr_len = ieee80211_hdrlen(hdr->frame_control); |
@@ -1030,9 +1030,9 @@ static void ath10k_htt_rx_msdu(struct ath10k_htt *htt, | |||
1030 | 1030 | ||
1031 | rxd = (void *)skb->data - sizeof(*rxd); | 1031 | rxd = (void *)skb->data - sizeof(*rxd); |
1032 | fmt = MS(__le32_to_cpu(rxd->msdu_start.info1), | 1032 | fmt = MS(__le32_to_cpu(rxd->msdu_start.info1), |
1033 | RX_MSDU_START_INFO1_DECAP_FORMAT); | 1033 | RX_MSDU_START_INFO1_DECAP_FORMAT); |
1034 | enctype = MS(__le32_to_cpu(rxd->mpdu_start.info0), | 1034 | enctype = MS(__le32_to_cpu(rxd->mpdu_start.info0), |
1035 | RX_MPDU_START_INFO0_ENCRYPT_TYPE); | 1035 | RX_MPDU_START_INFO0_ENCRYPT_TYPE); |
1036 | hdr = (struct ieee80211_hdr *)rxd->rx_hdr_status; | 1036 | hdr = (struct ieee80211_hdr *)rxd->rx_hdr_status; |
1037 | hdr_len = ieee80211_hdrlen(hdr->frame_control); | 1037 | hdr_len = ieee80211_hdrlen(hdr->frame_control); |
1038 | 1038 | ||
@@ -1333,7 +1333,7 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt, | |||
1333 | } | 1333 | } |
1334 | 1334 | ||
1335 | static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt, | 1335 | static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt, |
1336 | struct htt_rx_fragment_indication *frag) | 1336 | struct htt_rx_fragment_indication *frag) |
1337 | { | 1337 | { |
1338 | struct ath10k *ar = htt->ar; | 1338 | struct ath10k *ar = htt->ar; |
1339 | struct sk_buff *msdu_head, *msdu_tail; | 1339 | struct sk_buff *msdu_head, *msdu_tail; |
@@ -1379,7 +1379,7 @@ static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt, | |||
1379 | tkip_mic_err = !!(attention & RX_ATTENTION_FLAGS_TKIP_MIC_ERR); | 1379 | tkip_mic_err = !!(attention & RX_ATTENTION_FLAGS_TKIP_MIC_ERR); |
1380 | decrypt_err = !!(attention & RX_ATTENTION_FLAGS_DECRYPT_ERR); | 1380 | decrypt_err = !!(attention & RX_ATTENTION_FLAGS_DECRYPT_ERR); |
1381 | fmt = MS(__le32_to_cpu(rxd->msdu_start.info1), | 1381 | fmt = MS(__le32_to_cpu(rxd->msdu_start.info1), |
1382 | RX_MSDU_START_INFO1_DECAP_FORMAT); | 1382 | RX_MSDU_START_INFO1_DECAP_FORMAT); |
1383 | 1383 | ||
1384 | if (fmt != RX_MSDU_DECAP_RAW) { | 1384 | if (fmt != RX_MSDU_DECAP_RAW) { |
1385 | ath10k_warn(ar, "we dont support non-raw fragmented rx yet\n"); | 1385 | ath10k_warn(ar, "we dont support non-raw fragmented rx yet\n"); |
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 5b35fff8127f..bd852078a413 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c | |||
@@ -896,7 +896,7 @@ static int ath10k_vdev_stop(struct ath10k_vif *arvif) | |||
896 | } | 896 | } |
897 | 897 | ||
898 | static void ath10k_control_beaconing(struct ath10k_vif *arvif, | 898 | static void ath10k_control_beaconing(struct ath10k_vif *arvif, |
899 | struct ieee80211_bss_conf *info) | 899 | struct ieee80211_bss_conf *info) |
900 | { | 900 | { |
901 | struct ath10k *ar = arvif->ar; | 901 | struct ath10k *ar = arvif->ar; |
902 | int ret = 0; | 902 | int ret = 0; |
@@ -1106,9 +1106,9 @@ static void ath10k_peer_assoc_h_crypto(struct ath10k *ar, | |||
1106 | ies = rcu_dereference(bss->ies); | 1106 | ies = rcu_dereference(bss->ies); |
1107 | 1107 | ||
1108 | wpaie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT, | 1108 | wpaie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT, |
1109 | WLAN_OUI_TYPE_MICROSOFT_WPA, | 1109 | WLAN_OUI_TYPE_MICROSOFT_WPA, |
1110 | ies->data, | 1110 | ies->data, |
1111 | ies->len); | 1111 | ies->len); |
1112 | rcu_read_unlock(); | 1112 | rcu_read_unlock(); |
1113 | cfg80211_put_bss(ar->hw->wiphy, bss); | 1113 | cfg80211_put_bss(ar->hw->wiphy, bss); |
1114 | } | 1114 | } |
@@ -1291,7 +1291,8 @@ static int ath10k_peer_assoc_qos_ap(struct ath10k *ar, | |||
1291 | sta->listen_interval - mac80211 patch required. | 1291 | sta->listen_interval - mac80211 patch required. |
1292 | Currently use 10 seconds */ | 1292 | Currently use 10 seconds */ |
1293 | ret = ath10k_wmi_set_ap_ps_param(ar, arvif->vdev_id, sta->addr, | 1293 | ret = ath10k_wmi_set_ap_ps_param(ar, arvif->vdev_id, sta->addr, |
1294 | WMI_AP_PS_PEER_PARAM_AGEOUT_TIME, 10); | 1294 | WMI_AP_PS_PEER_PARAM_AGEOUT_TIME, |
1295 | 10); | ||
1295 | if (ret) { | 1296 | if (ret) { |
1296 | ath10k_warn(ar, "failed to set ap ps peer param ageout time for vdev %i: %d\n", | 1297 | ath10k_warn(ar, "failed to set ap ps peer param ageout time for vdev %i: %d\n", |
1297 | arvif->vdev_id, ret); | 1298 | arvif->vdev_id, ret); |
@@ -3568,7 +3569,7 @@ exit: | |||
3568 | } | 3569 | } |
3569 | 3570 | ||
3570 | static int ath10k_conf_tx_uapsd(struct ath10k *ar, struct ieee80211_vif *vif, | 3571 | static int ath10k_conf_tx_uapsd(struct ath10k *ar, struct ieee80211_vif *vif, |
3571 | u16 ac, bool enable) | 3572 | u16 ac, bool enable) |
3572 | { | 3573 | { |
3573 | struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif); | 3574 | struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif); |
3574 | u32 value = 0; | 3575 | u32 value = 0; |
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index baeb98e78b1f..52f273b92fa3 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c | |||
@@ -527,7 +527,7 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data, | |||
527 | address); | 527 | address); |
528 | 528 | ||
529 | ret = ath10k_ce_send(ce_diag, NULL, (u32)address, nbytes, 0, | 529 | ret = ath10k_ce_send(ce_diag, NULL, (u32)address, nbytes, 0, |
530 | 0); | 530 | 0); |
531 | if (ret) | 531 | if (ret) |
532 | goto done; | 532 | goto done; |
533 | 533 | ||
@@ -1106,7 +1106,7 @@ static int ath10k_pci_hif_map_service_to_pipe(struct ath10k *ar, | |||
1106 | } | 1106 | } |
1107 | 1107 | ||
1108 | static void ath10k_pci_hif_get_default_pipe(struct ath10k *ar, | 1108 | static void ath10k_pci_hif_get_default_pipe(struct ath10k *ar, |
1109 | u8 *ul_pipe, u8 *dl_pipe) | 1109 | u8 *ul_pipe, u8 *dl_pipe) |
1110 | { | 1110 | { |
1111 | int ul_is_polled, dl_is_polled; | 1111 | int ul_is_polled, dl_is_polled; |
1112 | 1112 | ||
@@ -1476,8 +1476,8 @@ static int ath10k_pci_init_config(struct ath10k *ar) | |||
1476 | } | 1476 | } |
1477 | 1477 | ||
1478 | ret = ath10k_pci_diag_write_mem(ar, pipe_cfg_targ_addr, | 1478 | ret = ath10k_pci_diag_write_mem(ar, pipe_cfg_targ_addr, |
1479 | target_ce_config_wlan, | 1479 | target_ce_config_wlan, |
1480 | sizeof(target_ce_config_wlan)); | 1480 | sizeof(target_ce_config_wlan)); |
1481 | 1481 | ||
1482 | if (ret != 0) { | 1482 | if (ret != 0) { |
1483 | ath10k_err(ar, "Failed to write pipe cfg: %d\n", ret); | 1483 | ath10k_err(ar, "Failed to write pipe cfg: %d\n", ret); |
@@ -1500,8 +1500,8 @@ static int ath10k_pci_init_config(struct ath10k *ar) | |||
1500 | } | 1500 | } |
1501 | 1501 | ||
1502 | ret = ath10k_pci_diag_write_mem(ar, svc_to_pipe_map, | 1502 | ret = ath10k_pci_diag_write_mem(ar, svc_to_pipe_map, |
1503 | target_service_to_ce_map_wlan, | 1503 | target_service_to_ce_map_wlan, |
1504 | sizeof(target_service_to_ce_map_wlan)); | 1504 | sizeof(target_service_to_ce_map_wlan)); |
1505 | if (ret != 0) { | 1505 | if (ret != 0) { |
1506 | ath10k_err(ar, "Failed to write svc/pipe map: %d\n", ret); | 1506 | ath10k_err(ar, "Failed to write svc/pipe map: %d\n", ret); |
1507 | return ret; | 1507 | return ret; |
@@ -2160,7 +2160,7 @@ static int ath10k_pci_init_irq(struct ath10k *ar) | |||
2160 | if (ath10k_pci_irq_mode == ATH10K_PCI_IRQ_AUTO) { | 2160 | if (ath10k_pci_irq_mode == ATH10K_PCI_IRQ_AUTO) { |
2161 | ar_pci->num_msi_intrs = MSI_NUM_REQUEST; | 2161 | ar_pci->num_msi_intrs = MSI_NUM_REQUEST; |
2162 | ret = pci_enable_msi_range(ar_pci->pdev, ar_pci->num_msi_intrs, | 2162 | ret = pci_enable_msi_range(ar_pci->pdev, ar_pci->num_msi_intrs, |
2163 | ar_pci->num_msi_intrs); | 2163 | ar_pci->num_msi_intrs); |
2164 | if (ret > 0) | 2164 | if (ret > 0) |
2165 | return 0; | 2165 | return 0; |
2166 | 2166 | ||
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 3e2213409074..3b5749d8b081 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c | |||
@@ -1859,9 +1859,10 @@ static void ath10k_wmi_event_dfs(struct ath10k *ar, | |||
1859 | } | 1859 | } |
1860 | } | 1860 | } |
1861 | 1861 | ||
1862 | static void ath10k_wmi_event_spectral_scan(struct ath10k *ar, | 1862 | static void |
1863 | struct wmi_single_phyerr_rx_event *event, | 1863 | ath10k_wmi_event_spectral_scan(struct ath10k *ar, |
1864 | u64 tsf) | 1864 | struct wmi_single_phyerr_rx_event *event, |
1865 | u64 tsf) | ||
1865 | { | 1866 | { |
1866 | int buf_len, tlv_len, res, i = 0; | 1867 | int buf_len, tlv_len, res, i = 0; |
1867 | struct phyerr_tlv *tlv; | 1868 | struct phyerr_tlv *tlv; |
@@ -1989,7 +1990,7 @@ static void ath10k_wmi_event_roam(struct ath10k *ar, struct sk_buff *skb) | |||
1989 | } | 1990 | } |
1990 | 1991 | ||
1991 | static void ath10k_wmi_event_profile_match(struct ath10k *ar, | 1992 | static void ath10k_wmi_event_profile_match(struct ath10k *ar, |
1992 | struct sk_buff *skb) | 1993 | struct sk_buff *skb) |
1993 | { | 1994 | { |
1994 | ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_PROFILE_MATCH\n"); | 1995 | ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_PROFILE_MATCH\n"); |
1995 | } | 1996 | } |
@@ -2040,13 +2041,13 @@ static void ath10k_wmi_event_wlan_profile_data(struct ath10k *ar, | |||
2040 | } | 2041 | } |
2041 | 2042 | ||
2042 | static void ath10k_wmi_event_rtt_measurement_report(struct ath10k *ar, | 2043 | static void ath10k_wmi_event_rtt_measurement_report(struct ath10k *ar, |
2043 | struct sk_buff *skb) | 2044 | struct sk_buff *skb) |
2044 | { | 2045 | { |
2045 | ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_RTT_MEASUREMENT_REPORT_EVENTID\n"); | 2046 | ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_RTT_MEASUREMENT_REPORT_EVENTID\n"); |
2046 | } | 2047 | } |
2047 | 2048 | ||
2048 | static void ath10k_wmi_event_tsf_measurement_report(struct ath10k *ar, | 2049 | static void ath10k_wmi_event_tsf_measurement_report(struct ath10k *ar, |
2049 | struct sk_buff *skb) | 2050 | struct sk_buff *skb) |
2050 | { | 2051 | { |
2051 | ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_TSF_MEASUREMENT_REPORT_EVENTID\n"); | 2052 | ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_TSF_MEASUREMENT_REPORT_EVENTID\n"); |
2052 | } | 2053 | } |
@@ -2082,7 +2083,7 @@ static void ath10k_wmi_event_pdev_ftm_intg(struct ath10k *ar, | |||
2082 | } | 2083 | } |
2083 | 2084 | ||
2084 | static void ath10k_wmi_event_gtk_offload_status(struct ath10k *ar, | 2085 | static void ath10k_wmi_event_gtk_offload_status(struct ath10k *ar, |
2085 | struct sk_buff *skb) | 2086 | struct sk_buff *skb) |
2086 | { | 2087 | { |
2087 | ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_GTK_OFFLOAD_STATUS_EVENTID\n"); | 2088 | ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_GTK_OFFLOAD_STATUS_EVENTID\n"); |
2088 | } | 2089 | } |
@@ -2106,7 +2107,7 @@ static void ath10k_wmi_event_addba_complete(struct ath10k *ar, | |||
2106 | } | 2107 | } |
2107 | 2108 | ||
2108 | static void ath10k_wmi_event_vdev_install_key_complete(struct ath10k *ar, | 2109 | static void ath10k_wmi_event_vdev_install_key_complete(struct ath10k *ar, |
2109 | struct sk_buff *skb) | 2110 | struct sk_buff *skb) |
2110 | { | 2111 | { |
2111 | ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_VDEV_INSTALL_KEY_COMPLETE_EVENTID\n"); | 2112 | ath10k_dbg(ar, ATH10K_DBG_WMI, "WMI_VDEV_INSTALL_KEY_COMPLETE_EVENTID\n"); |
2112 | } | 2113 | } |
@@ -2130,7 +2131,7 @@ static void ath10k_wmi_event_vdev_resume_req(struct ath10k *ar, | |||
2130 | } | 2131 | } |
2131 | 2132 | ||
2132 | static int ath10k_wmi_alloc_host_mem(struct ath10k *ar, u32 req_id, | 2133 | static int ath10k_wmi_alloc_host_mem(struct ath10k *ar, u32 req_id, |
2133 | u32 num_units, u32 unit_len) | 2134 | u32 num_units, u32 unit_len) |
2134 | { | 2135 | { |
2135 | dma_addr_t paddr; | 2136 | dma_addr_t paddr; |
2136 | u32 pool_size; | 2137 | u32 pool_size; |
@@ -3520,9 +3521,10 @@ int ath10k_wmi_vdev_delete(struct ath10k *ar, u32 vdev_id) | |||
3520 | return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_delete_cmdid); | 3521 | return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->vdev_delete_cmdid); |
3521 | } | 3522 | } |
3522 | 3523 | ||
3523 | static int ath10k_wmi_vdev_start_restart(struct ath10k *ar, | 3524 | static int |
3524 | const struct wmi_vdev_start_request_arg *arg, | 3525 | ath10k_wmi_vdev_start_restart(struct ath10k *ar, |
3525 | u32 cmd_id) | 3526 | const struct wmi_vdev_start_request_arg *arg, |
3527 | u32 cmd_id) | ||
3526 | { | 3528 | { |
3527 | struct wmi_vdev_start_request_cmd *cmd; | 3529 | struct wmi_vdev_start_request_cmd *cmd; |
3528 | struct sk_buff *skb; | 3530 | struct sk_buff *skb; |
@@ -3603,7 +3605,7 @@ int ath10k_wmi_vdev_start(struct ath10k *ar, | |||
3603 | } | 3605 | } |
3604 | 3606 | ||
3605 | int ath10k_wmi_vdev_restart(struct ath10k *ar, | 3607 | int ath10k_wmi_vdev_restart(struct ath10k *ar, |
3606 | const struct wmi_vdev_start_request_arg *arg) | 3608 | const struct wmi_vdev_start_request_arg *arg) |
3607 | { | 3609 | { |
3608 | u32 cmd_id = ar->wmi.cmd->vdev_restart_request_cmdid; | 3610 | u32 cmd_id = ar->wmi.cmd->vdev_restart_request_cmdid; |
3609 | 3611 | ||
@@ -4172,7 +4174,7 @@ static void ath10k_wmi_pdev_set_wmm_param(struct wmi_wmm_params *params, | |||
4172 | } | 4174 | } |
4173 | 4175 | ||
4174 | int ath10k_wmi_pdev_set_wmm_params(struct ath10k *ar, | 4176 | int ath10k_wmi_pdev_set_wmm_params(struct ath10k *ar, |
4175 | const struct wmi_pdev_set_wmm_params_arg *arg) | 4177 | const struct wmi_pdev_set_wmm_params_arg *arg) |
4176 | { | 4178 | { |
4177 | struct wmi_pdev_set_wmm_params *cmd; | 4179 | struct wmi_pdev_set_wmm_params *cmd; |
4178 | struct sk_buff *skb; | 4180 | struct sk_buff *skb; |
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index f8c1afbdb442..1cc594e18a07 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h | |||
@@ -4776,11 +4776,11 @@ int ath10k_wmi_vdev_spectral_conf(struct ath10k *ar, | |||
4776 | int ath10k_wmi_vdev_spectral_enable(struct ath10k *ar, u32 vdev_id, u32 trigger, | 4776 | int ath10k_wmi_vdev_spectral_enable(struct ath10k *ar, u32 vdev_id, u32 trigger, |
4777 | u32 enable); | 4777 | u32 enable); |
4778 | int ath10k_wmi_peer_create(struct ath10k *ar, u32 vdev_id, | 4778 | int ath10k_wmi_peer_create(struct ath10k *ar, u32 vdev_id, |
4779 | const u8 peer_addr[ETH_ALEN]); | 4779 | const u8 peer_addr[ETH_ALEN]); |
4780 | int ath10k_wmi_peer_delete(struct ath10k *ar, u32 vdev_id, | 4780 | int ath10k_wmi_peer_delete(struct ath10k *ar, u32 vdev_id, |
4781 | const u8 peer_addr[ETH_ALEN]); | 4781 | const u8 peer_addr[ETH_ALEN]); |
4782 | int ath10k_wmi_peer_flush(struct ath10k *ar, u32 vdev_id, | 4782 | int ath10k_wmi_peer_flush(struct ath10k *ar, u32 vdev_id, |
4783 | const u8 peer_addr[ETH_ALEN], u32 tid_bitmap); | 4783 | const u8 peer_addr[ETH_ALEN], u32 tid_bitmap); |
4784 | int ath10k_wmi_peer_set_param(struct ath10k *ar, u32 vdev_id, | 4784 | int ath10k_wmi_peer_set_param(struct ath10k *ar, u32 vdev_id, |
4785 | const u8 *peer_addr, | 4785 | const u8 *peer_addr, |
4786 | enum wmi_peer_param param_id, u32 param_value); | 4786 | enum wmi_peer_param param_id, u32 param_value); |
@@ -4797,7 +4797,7 @@ int ath10k_wmi_scan_chan_list(struct ath10k *ar, | |||
4797 | const struct wmi_scan_chan_list_arg *arg); | 4797 | const struct wmi_scan_chan_list_arg *arg); |
4798 | int ath10k_wmi_beacon_send_ref_nowait(struct ath10k_vif *arvif); | 4798 | int ath10k_wmi_beacon_send_ref_nowait(struct ath10k_vif *arvif); |
4799 | int ath10k_wmi_pdev_set_wmm_params(struct ath10k *ar, | 4799 | int ath10k_wmi_pdev_set_wmm_params(struct ath10k *ar, |
4800 | const struct wmi_pdev_set_wmm_params_arg *arg); | 4800 | const struct wmi_pdev_set_wmm_params_arg *arg); |
4801 | int ath10k_wmi_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id); | 4801 | int ath10k_wmi_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id); |
4802 | int ath10k_wmi_force_fw_hang(struct ath10k *ar, | 4802 | int ath10k_wmi_force_fw_hang(struct ath10k *ar, |
4803 | enum wmi_force_fw_hang_type type, u32 delay_ms); | 4803 | enum wmi_force_fw_hang_type type, u32 delay_ms); |