From: Kalle Valo Date: Wed, 24 Apr 2013 15:33:10 +0300 Subject: [ath9k-devel] [PATCH 4/5] ath10k: fix checkpatch warnings in ce.h, core.c, htc.c, htt_tx.c and txrx.c In-Reply-To: <20130424123142.30784.57385.stgit@localhost6.localdomain6> References: <20130424123142.30784.57385.stgit@localhost6.localdomain6> Message-ID: <20130424123310.30784.38287.stgit@localhost6.localdomain6> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ath9k-devel@lists.ath9k.org Signed-off-by: Kalle Valo --- drivers/net/wireless/ath/ath10k/ce.h | 4 +-- drivers/net/wireless/ath/ath10k/core.c | 12 +++++--- drivers/net/wireless/ath/ath10k/htc.c | 45 ++++++++++++++++------------- drivers/net/wireless/ath/ath10k/htt_tx.c | 46 +++++++++++++++++------------- drivers/net/wireless/ath/ath10k/txrx.c | 3 +- 5 files changed, 62 insertions(+), 48 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/ce.h b/drivers/net/wireless/ath/ath10k/ce.h index 110532f..4558630 100644 --- a/drivers/net/wireless/ath/ath10k/ce.h +++ b/drivers/net/wireless/ath/ath10k/ce.h @@ -193,7 +193,7 @@ int ath10k_ce_send(struct ce_state *ce_state, void ath10k_ce_send_cb_register(struct ce_state *ce_state, void (*send_cb) (struct ce_state *ce_state, - void *per_transfer_send_context, + void *transfer_context, u32 buffer, unsigned int nbytes, unsigned int transfer_id), @@ -240,7 +240,7 @@ int ath10k_ce_recv_buf_enqueue(struct ce_state *ce_state, void ath10k_ce_recv_cb_register(struct ce_state *ce_state, void (*recv_cb) (struct ce_state *ce_state, - void *per_transfer_recv_context, + void *transfer_context, u32 buffer, unsigned int nbytes, unsigned int transfer_id, diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 4ff500c..ed2c94f 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -132,7 +132,8 @@ static int ath10k_init_configure_target(struct ath10k *ar) int ret; /* tell target which HTC version it is used*/ - ret = ath10k_bmi_write32(ar, hi_app_host_interest, HTC_PROTOCOL_VERSION); + ret = ath10k_bmi_write32(ar, hi_app_host_interest, + HTC_PROTOCOL_VERSION); if (ret) { ath10k_err("settings HTC version failed\n"); return ret; @@ -285,7 +286,8 @@ static int ath10k_init_transfer_bin_file(struct ath10k *ar, } /* - * Record the fact that extended board Data IS initialized + * Record the fact that extended board Data IS + * initialized */ ath10k_bmi_write32(ar, hi_board_ext_data_config, (board_ext_data_size << 16) | 1); @@ -602,7 +604,8 @@ void ath10k_core_unregister(struct ath10k *ar) } EXPORT_SYMBOL(ath10k_core_unregister); -int ath10k_core_target_suspend(struct ath10k *ar) { +int ath10k_core_target_suspend(struct ath10k *ar) +{ int ret; ath10k_dbg(ATH10K_DBG_CORE, "%s: called", __func__); @@ -613,7 +616,8 @@ int ath10k_core_target_suspend(struct ath10k *ar) { } EXPORT_SYMBOL(ath10k_core_target_suspend); -int ath10k_core_target_resume(struct ath10k *ar) { +int ath10k_core_target_resume(struct ath10k *ar) +{ int ret; diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c index f2a9e63..56a06b0 100644 --- a/drivers/net/wireless/ath/ath10k/htc.c +++ b/drivers/net/wireless/ath/ath10k/htc.c @@ -132,7 +132,8 @@ static bool ath10k_htc_ep_need_credit_update(struct ath10k_htc_ep *ep) if (ep->tx_credits >= ep->tx_credits_per_max_message) return false; - ath10k_dbg(ATH10K_DBG_HTC, "HTC: endpoint %d needs credit update\n", ep->eid); + ath10k_dbg(ATH10K_DBG_HTC, "HTC: endpoint %d needs credit update\n", + ep->eid); return true; } @@ -249,7 +250,8 @@ static struct sk_buff *ath10k_htc_get_skb_credit_based(struct ath10k_htc *htc, /* shouldn't happen, but print a warning just in case */ if (credits_required >= 1 << (8*sizeof(skb_cb->htc.credits_used))) - ath10k_warn("credits_required value overflow (%d)\n", credits_required); + ath10k_warn("credits_required value overflow (%d)\n", + credits_required); skb_cb->htc.credits_used = credits_required; return skb; @@ -524,7 +526,7 @@ static int ath10k_htc_rx_completion_handler(struct ath10k *ar, if (payload_len + sizeof(*hdr) > ATH10K_HTC_MAX_LEN) { ath10k_warn("HTC rx frame too long, len: %zu\n", - payload_len + sizeof(*hdr)); + payload_len + sizeof(*hdr)); ath10k_dbg_dump(ATH10K_DBG_HTC, "htc bad rx pkt len", "", hdr, sizeof(*hdr)); status = -EINVAL; @@ -533,10 +535,10 @@ static int ath10k_htc_rx_completion_handler(struct ath10k *ar, if (skb->len < payload_len) { ath10k_dbg(ATH10K_DBG_HTC, - "HTC Rx: insufficient length, got %d, expected %d\n", - skb->len, payload_len); + "HTC Rx: insufficient length, got %d, expected %d\n", + skb->len, payload_len); ath10k_dbg_dump(ATH10K_DBG_HTC, "htc bad rx pkt len", - "", hdr, sizeof(*hdr)); + "", hdr, sizeof(*hdr)); status = -EINVAL; goto out; } @@ -550,7 +552,7 @@ static int ath10k_htc_rx_completion_handler(struct ath10k *ar, if ((trailer_len < sizeof(struct ath10k_ath10k_htc_record_hdr)) || (trailer_len > payload_len)) { ath10k_warn("Invalid trailer length: %d\n", - trailer_len); + trailer_len); status = -EPROTO; goto out; } @@ -602,7 +604,8 @@ static int ath10k_htc_rx_completion_handler(struct ath10k *ar, goto out; } - ath10k_dbg(ATH10K_DBG_HTC, "htc rx completion ep %d skb %p\n", eid, skb); + ath10k_dbg(ATH10K_DBG_HTC, "htc rx completion ep %d skb %p\n", + eid, skb); ep->ep_ops.ep_rx_complete(ep->ep_ops.context, skb); /* skb is now owned by the rx completion handler */ @@ -776,8 +779,7 @@ int ath10k_htc_connect_service(struct ath10k_htc *htc, tx_alloc = ath10k_htc_get_credit_allocation(htc, conn_req->service_id); if (!tx_alloc) - ath10k_warn("Service 0x%x does not" - " allocate target credits\n", + ath10k_warn("Service 0x%x does not allocate target credits\n", conn_req->service_id); skb = ath10k_htc_build_tx_ctrl_skb(htc->ar); @@ -791,7 +793,8 @@ int ath10k_htc_connect_service(struct ath10k_htc *htc, memset(skb->data, 0, length); msg = (struct ath10k_htc_msg *)skb->data; - msg->hdr.message_id = __cpu_to_le16(ATH10K_HTC_MSG_CONNECT_SERVICE_ID); + msg->hdr.message_id = + __cpu_to_le16(ATH10K_HTC_MSG_CONNECT_SERVICE_ID); flags |= SM(tx_alloc, ATH10K_HTC_CONN_FLAGS_RECV_ALLOC); @@ -834,16 +837,15 @@ int ath10k_htc_connect_service(struct ath10k_htc *htc, return -EPROTO; } - ath10k_dbg(ATH10K_DBG_HTC, "Service 0x%x connect response" - " from target: status: 0x%x, assigned ep: 0x%x\n", + ath10k_dbg(ATH10K_DBG_HTC, + "Service 0x%x connect response from target: status: 0x%x, assigned ep: 0x%x\n", service_id, resp_msg->status, resp_msg->eid); conn_resp->connect_resp_code = resp_msg->status; /* check response status */ if (resp_msg->status != ATH10K_HTC_CONN_SVC_STATUS_SUCCESS) { - ath10k_err("Service 0x%x connect request failed" - " with status: 0x%x)\n", + ath10k_err("Service 0x%x connect request failed with status: 0x%x)\n", service_id, resp_msg->status); return -EPROTO; } @@ -892,16 +894,16 @@ int ath10k_htc_connect_service(struct ath10k_htc *htc, if (status) return status; - ath10k_dbg(ATH10K_DBG_HTC, "HTC service: 0x%x" - " UL pipe: %d DL pipe: %d eid: %d ready\n", + ath10k_dbg(ATH10K_DBG_HTC, + "HTC service: 0x%x UL pipe: %d DL pipe: %d eid: %d ready\n", ep->service_id, ep->ul_pipe_id, ep->dl_pipe_id, ep->eid); if (disable_credit_flow_ctrl && ep->tx_credit_flow_enabled) { ep->tx_credit_flow_enabled = false; - ath10k_dbg(ATH10K_DBG_HTC, "HTC service: 0x%x eid: %d" - " TX flow control disabled\n", - ep->service_id, assigned_eid); + ath10k_dbg(ATH10K_DBG_HTC, + "HTC service: 0x%x eid: %d TX flow control disabled\n", + ep->service_id, assigned_eid); } return status; @@ -938,7 +940,8 @@ int ath10k_htc_start(struct ath10k_htc *htc) memset(skb->data, 0, skb->len); msg = (struct ath10k_htc_msg *)skb->data; - msg->hdr.message_id = __cpu_to_le16(ATH10K_HTC_MSG_SETUP_COMPLETE_EX_ID); + msg->hdr.message_id = + __cpu_to_le16(ATH10K_HTC_MSG_SETUP_COMPLETE_EX_ID); ath10k_dbg(ATH10K_DBG_HTC, "HTC is using TX credit flow control\n"); diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c index 8d60f56..9f7ee9e 100644 --- a/drivers/net/wireless/ath/ath10k/htt_tx.c +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c @@ -27,7 +27,8 @@ int ath10k_htt_tx_alloc_msdu_id(struct ath10k_htt *htt) lockdep_assert_held(&htt->tx_lock); - msdu_id = find_first_zero_bit(htt->used_msdu_ids, HTT_MAX_NUM_PENDING_TX); + msdu_id = find_first_zero_bit(htt->used_msdu_ids, + HTT_MAX_NUM_PENDING_TX); if (msdu_id == HTT_MAX_NUM_PENDING_TX) return -ENOMEM; @@ -192,24 +193,28 @@ int ath10k_htt_send_rx_ring_cfg_ll(struct ath10k_htt *htt) fw_idx = __le32_to_cpu(*htt->rx_ring.alloc_idx.vaddr); - ring->fw_idx_shadow_reg_paddr = __cpu_to_le32(htt->rx_ring.alloc_idx.paddr); - ring->rx_ring_base_paddr = __cpu_to_le32(htt->rx_ring.base_paddr); - ring->rx_ring_len = __cpu_to_le16(htt->rx_ring.size); - ring->rx_ring_bufsize = __cpu_to_le16(HTT_RX_BUF_SIZE); - ring->flags = __cpu_to_le16(flags); - ring->fw_idx_init_val = __cpu_to_le16(fw_idx); -#define rx_desc_offset(x) (offsetof(struct htt_rx_desc, x) / 4) - ring->mac80211_hdr_offset = __cpu_to_le16(rx_desc_offset(rx_hdr_status)); - ring->msdu_payload_offset = __cpu_to_le16(rx_desc_offset(msdu_payload)); - ring->ppdu_start_offset = __cpu_to_le16(rx_desc_offset(ppdu_start)); - ring->ppdu_end_offset = __cpu_to_le16(rx_desc_offset(ppdu_end)); - ring->mpdu_start_offset = __cpu_to_le16(rx_desc_offset(mpdu_start)); - ring->mpdu_end_offset = __cpu_to_le16(rx_desc_offset(mpdu_end)); - ring->msdu_start_offset = __cpu_to_le16(rx_desc_offset(msdu_start)); - ring->msdu_end_offset = __cpu_to_le16(rx_desc_offset(msdu_end)); - ring->rx_attention_offset = __cpu_to_le16(rx_desc_offset(attention)); - ring->frag_info_offset = __cpu_to_le16(rx_desc_offset(frag_info)); -#undef rx_desc_offset + ring->fw_idx_shadow_reg_paddr = + __cpu_to_le32(htt->rx_ring.alloc_idx.paddr); + ring->rx_ring_base_paddr = __cpu_to_le32(htt->rx_ring.base_paddr); + ring->rx_ring_len = __cpu_to_le16(htt->rx_ring.size); + ring->rx_ring_bufsize = __cpu_to_le16(HTT_RX_BUF_SIZE); + ring->flags = __cpu_to_le16(flags); + ring->fw_idx_init_val = __cpu_to_le16(fw_idx); + +#define desc_offset(x) (offsetof(struct htt_rx_desc, x) / 4) + + ring->mac80211_hdr_offset = __cpu_to_le16(desc_offset(rx_hdr_status)); + ring->msdu_payload_offset = __cpu_to_le16(desc_offset(msdu_payload)); + ring->ppdu_start_offset = __cpu_to_le16(desc_offset(ppdu_start)); + ring->ppdu_end_offset = __cpu_to_le16(desc_offset(ppdu_end)); + ring->mpdu_start_offset = __cpu_to_le16(desc_offset(mpdu_start)); + ring->mpdu_end_offset = __cpu_to_le16(desc_offset(mpdu_end)); + ring->msdu_start_offset = __cpu_to_le16(desc_offset(msdu_start)); + ring->msdu_end_offset = __cpu_to_le16(desc_offset(msdu_end)); + ring->rx_attention_offset = __cpu_to_le16(desc_offset(attention)); + ring->frag_info_offset = __cpu_to_le16(desc_offset(frag_info)); + +#undef desc_offset ATH10K_SKB_CB(skb)->htt.is_conf = true; @@ -379,7 +384,8 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) if (!ieee80211_has_protected(hdr->frame_control)) flags0 |= HTT_DATA_TX_DESC_FLAGS0_NO_ENCRYPT; flags0 |= HTT_DATA_TX_DESC_FLAGS0_MAC_HDR_PRESENT; - flags0 |= SM(ATH10K_HW_TXRX_NATIVE_WIFI, HTT_DATA_TX_DESC_FLAGS0_PKT_TYPE); + flags0 |= SM(ATH10K_HW_TXRX_NATIVE_WIFI, + HTT_DATA_TX_DESC_FLAGS0_PKT_TYPE); flags1 = 0; flags1 |= SM((u16)vdev_id, HTT_DATA_TX_DESC_FLAGS1_VDEV_ID); diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c index 23c3a5d..41b58ba 100644 --- a/drivers/net/wireless/ath/ath10k/txrx.c +++ b/drivers/net/wireless/ath/ath10k/txrx.c @@ -109,7 +109,8 @@ void ath10k_txrx_tx_completed(struct ath10k_htt *htt, tx_done->msdu_id, !!tx_done->discard, !!tx_done->no_ack); if (tx_done->msdu_id >= ARRAY_SIZE(htt->pending_tx)) { - ath10k_warn("warning: msdu_id %d too big, ignoring\n", tx_done->msdu_id); + ath10k_warn("warning: msdu_id %d too big, ignoring\n", + tx_done->msdu_id); return; }