|
@@ -185,8 +185,8 @@ static void ath6kl_credit_update(struct ath6kl_htc_credit_info *cred_info,
|
|
|
if (cur_dist_list->credits >
|
|
|
cur_dist_list->cred_assngd)
|
|
|
ath6kl_credit_reduce(cred_info,
|
|
|
- cur_dist_list,
|
|
|
- cur_dist_list->cred_assngd);
|
|
|
+ cur_dist_list,
|
|
|
+ cur_dist_list->cred_assngd);
|
|
|
|
|
|
if (cur_dist_list->credits >
|
|
|
cur_dist_list->cred_norm)
|
|
@@ -464,8 +464,8 @@ static void htc_async_tx_scat_complete(struct htc_target *target,
|
|
|
INIT_LIST_HEAD(&tx_compq);
|
|
|
|
|
|
ath6kl_dbg(ATH6KL_DBG_HTC,
|
|
|
- "htc tx scat complete len %d entries %d\n",
|
|
|
- scat_req->len, scat_req->scat_entries);
|
|
|
+ "htc tx scat complete len %d entries %d\n",
|
|
|
+ scat_req->len, scat_req->scat_entries);
|
|
|
|
|
|
if (scat_req->status)
|
|
|
ath6kl_err("send scatter req failed: %d\n", scat_req->status);
|
|
@@ -603,8 +603,8 @@ static void ath6kl_htc_tx_pkts_get(struct htc_target *target,
|
|
|
list);
|
|
|
|
|
|
ath6kl_dbg(ATH6KL_DBG_HTC,
|
|
|
- "htc tx got packet 0x%p queue depth %d\n",
|
|
|
- packet, get_queue_depth(&endpoint->txq));
|
|
|
+ "htc tx got packet 0x%p queue depth %d\n",
|
|
|
+ packet, get_queue_depth(&endpoint->txq));
|
|
|
|
|
|
len = CALC_TXRX_PADDED_LEN(target,
|
|
|
packet->act_len + HTC_HDR_LENGTH);
|
|
@@ -701,8 +701,8 @@ static int ath6kl_htc_tx_setup_scat_list(struct htc_target *target,
|
|
|
scat_req->scat_list[i].packet = packet;
|
|
|
/* prepare packet and flag message as part of a send bundle */
|
|
|
ath6kl_htc_tx_prep_pkt(packet,
|
|
|
- packet->info.tx.flags | HTC_FLAGS_SEND_BUNDLE,
|
|
|
- cred_pad, packet->info.tx.seqno);
|
|
|
+ packet->info.tx.flags | HTC_FLAGS_SEND_BUNDLE,
|
|
|
+ cred_pad, packet->info.tx.seqno);
|
|
|
/* Make sure the buffer is 4-byte aligned */
|
|
|
ath6kl_htc_tx_buf_align(&packet->buf,
|
|
|
packet->act_len + HTC_HDR_LENGTH);
|
|
@@ -752,7 +752,7 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint,
|
|
|
u8 ac = WMM_NUM_AC;
|
|
|
|
|
|
if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) ||
|
|
|
- (WMI_CONTROL_SVC != endpoint->svc_id))
|
|
|
+ (WMI_CONTROL_SVC != endpoint->svc_id))
|
|
|
ac = target->dev->ar->ep2ac_map[endpoint->eid];
|
|
|
|
|
|
while (true) {
|
|
@@ -769,7 +769,7 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint,
|
|
|
if (!scat_req) {
|
|
|
/* no scatter resources */
|
|
|
ath6kl_dbg(ATH6KL_DBG_HTC,
|
|
|
- "htc tx no more scatter resources\n");
|
|
|
+ "htc tx no more scatter resources\n");
|
|
|
break;
|
|
|
}
|
|
|
|
|
@@ -860,7 +860,7 @@ static void ath6kl_htc_tx_from_queue(struct htc_target *target,
|
|
|
INIT_LIST_HEAD(&txq);
|
|
|
|
|
|
if ((HTC_CTRL_RSVD_SVC != endpoint->svc_id) ||
|
|
|
- (WMI_CONTROL_SVC != endpoint->svc_id))
|
|
|
+ (WMI_CONTROL_SVC != endpoint->svc_id))
|
|
|
ac = target->dev->ar->ep2ac_map[endpoint->eid];
|
|
|
|
|
|
while (true) {
|
|
@@ -918,7 +918,7 @@ static void ath6kl_htc_tx_from_queue(struct htc_target *target,
|
|
|
*/
|
|
|
if (!bundle_sent) {
|
|
|
if (!(target->tx_bndl_mask & (1 << ac)) &&
|
|
|
- (ac < WMM_NUM_AC)) {
|
|
|
+ (ac < WMM_NUM_AC)) {
|
|
|
if (++target->ac_tx_count[ac] >=
|
|
|
TX_RESUME_BUNDLE_THRESHOLD) {
|
|
|
target->ac_tx_count[ac] = 0;
|
|
@@ -1042,8 +1042,8 @@ static int htc_setup_tx_complete(struct htc_target *target)
|
|
|
memcpy(&setup_comp_ext->flags, &flags,
|
|
|
sizeof(setup_comp_ext->flags));
|
|
|
set_htc_pkt_info(send_pkt, NULL, (u8 *) setup_comp_ext,
|
|
|
- sizeof(struct htc_setup_comp_ext_msg),
|
|
|
- ENDPOINT_0, HTC_SERVICE_TX_PACKET_TAG);
|
|
|
+ sizeof(struct htc_setup_comp_ext_msg),
|
|
|
+ ENDPOINT_0, HTC_SERVICE_TX_PACKET_TAG);
|
|
|
|
|
|
} else {
|
|
|
struct htc_setup_comp_msg *setup_comp;
|
|
@@ -1051,8 +1051,8 @@ static int htc_setup_tx_complete(struct htc_target *target)
|
|
|
memset(setup_comp, 0, sizeof(struct htc_setup_comp_msg));
|
|
|
setup_comp->msg_id = cpu_to_le16(HTC_MSG_SETUP_COMPLETE_ID);
|
|
|
set_htc_pkt_info(send_pkt, NULL, (u8 *) setup_comp,
|
|
|
- sizeof(struct htc_setup_comp_msg),
|
|
|
- ENDPOINT_0, HTC_SERVICE_TX_PACKET_TAG);
|
|
|
+ sizeof(struct htc_setup_comp_msg),
|
|
|
+ ENDPOINT_0, HTC_SERVICE_TX_PACKET_TAG);
|
|
|
}
|
|
|
|
|
|
/* we want synchronous operation */
|
|
@@ -1151,9 +1151,9 @@ void ath6kl_htc_flush_txep(struct htc_target *target,
|
|
|
packet->status = -ECANCELED;
|
|
|
list_del(&packet->list);
|
|
|
ath6kl_dbg(ATH6KL_DBG_HTC,
|
|
|
- "htc tx flushing pkt 0x%p len %d ep %d tag 0x%x\n",
|
|
|
- packet, packet->act_len,
|
|
|
- packet->endpoint, packet->info.tx.tag);
|
|
|
+ "htc tx flushing pkt 0x%p len %d ep %d tag 0x%x\n",
|
|
|
+ packet, packet->act_len,
|
|
|
+ packet->endpoint, packet->info.tx.tag);
|
|
|
|
|
|
INIT_LIST_HEAD(&container);
|
|
|
list_add_tail(&packet->list, &container);
|
|
@@ -1553,7 +1553,7 @@ static void htc_ctrl_rx(struct htc_target *context, struct htc_packet *packets)
|
|
|
|
|
|
if (packets->act_len > 0) {
|
|
|
ath6kl_err("htc_ctrl_rx, got message with len:%zu\n",
|
|
|
- packets->act_len + HTC_HDR_LENGTH);
|
|
|
+ packets->act_len + HTC_HDR_LENGTH);
|
|
|
|
|
|
ath6kl_dbg_dump(ATH6KL_DBG_HTC,
|
|
|
"htc rx unexpected endpoint 0 message", "",
|
|
@@ -2101,13 +2101,13 @@ fail_rx:
|
|
|
list_for_each_entry_safe(packet, tmp_pkt, rx_pktq, list) {
|
|
|
list_del(&packet->list);
|
|
|
htc_reclaim_rxbuf(target, packet,
|
|
|
- &target->endpoint[packet->endpoint]);
|
|
|
+ &target->endpoint[packet->endpoint]);
|
|
|
}
|
|
|
|
|
|
list_for_each_entry_safe(packet, tmp_pkt, &tmp_rxq, list) {
|
|
|
list_del(&packet->list);
|
|
|
htc_reclaim_rxbuf(target, packet,
|
|
|
- &target->endpoint[packet->endpoint]);
|
|
|
+ &target->endpoint[packet->endpoint]);
|
|
|
}
|
|
|
|
|
|
return status;
|
|
@@ -2239,11 +2239,11 @@ static struct htc_packet *htc_wait_for_ctrl_msg(struct htc_target *target)
|
|
|
u32 look_ahead;
|
|
|
|
|
|
if (ath6kl_hif_poll_mboxmsg_rx(target->dev, &look_ahead,
|
|
|
- HTC_TARGET_RESPONSE_TIMEOUT))
|
|
|
+ HTC_TARGET_RESPONSE_TIMEOUT))
|
|
|
return NULL;
|
|
|
|
|
|
ath6kl_dbg(ATH6KL_DBG_HTC,
|
|
|
- "htc rx wait ctrl look_ahead 0x%X\n", look_ahead);
|
|
|
+ "htc rx wait ctrl look_ahead 0x%X\n", look_ahead);
|
|
|
|
|
|
htc_hdr = (struct htc_frame_hdr *)&look_ahead;
|
|
|
|
|
@@ -2308,7 +2308,7 @@ int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,
|
|
|
depth = get_queue_depth(pkt_queue);
|
|
|
|
|
|
ath6kl_dbg(ATH6KL_DBG_HTC,
|
|
|
- "htc rx add multiple ep id %d cnt %d len %d\n",
|
|
|
+ "htc rx add multiple ep id %d cnt %d len %d\n",
|
|
|
first_pkt->endpoint, depth, first_pkt->buf_len);
|
|
|
|
|
|
endpoint = &target->endpoint[first_pkt->endpoint];
|
|
@@ -2334,8 +2334,8 @@ int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,
|
|
|
if (target->rx_st_flags & HTC_RECV_WAIT_BUFFERS) {
|
|
|
if (target->ep_waiting == first_pkt->endpoint) {
|
|
|
ath6kl_dbg(ATH6KL_DBG_HTC,
|
|
|
- "htc rx blocked on ep %d, unblocking\n",
|
|
|
- target->ep_waiting);
|
|
|
+ "htc rx blocked on ep %d, unblocking\n",
|
|
|
+ target->ep_waiting);
|
|
|
target->rx_st_flags &= ~HTC_RECV_WAIT_BUFFERS;
|
|
|
target->ep_waiting = ENDPOINT_MAX;
|
|
|
rx_unblock = true;
|
|
@@ -2676,8 +2676,8 @@ int ath6kl_htc_wait_target(struct htc_target *target)
|
|
|
}
|
|
|
|
|
|
ath6kl_dbg(ATH6KL_DBG_BOOT, "htc using protocol %s (%d)\n",
|
|
|
- (target->htc_tgt_ver == HTC_VERSION_2P0) ? "2.0" : ">= 2.1",
|
|
|
- target->htc_tgt_ver);
|
|
|
+ (target->htc_tgt_ver == HTC_VERSION_2P0) ? "2.0" : ">= 2.1",
|
|
|
+ target->htc_tgt_ver);
|
|
|
|
|
|
if (target->msg_per_bndl_max > 0)
|
|
|
htc_setup_msg_bndl(target);
|
|
@@ -2871,14 +2871,14 @@ void ath6kl_htc_cleanup(struct htc_target *target)
|
|
|
ath6kl_hif_cleanup_scatter(target->dev->ar);
|
|
|
|
|
|
list_for_each_entry_safe(packet, tmp_packet,
|
|
|
- &target->free_ctrl_txbuf, list) {
|
|
|
+ &target->free_ctrl_txbuf, list) {
|
|
|
list_del(&packet->list);
|
|
|
kfree(packet->buf_start);
|
|
|
kfree(packet);
|
|
|
}
|
|
|
|
|
|
list_for_each_entry_safe(packet, tmp_packet,
|
|
|
- &target->free_ctrl_rxbuf, list) {
|
|
|
+ &target->free_ctrl_rxbuf, list) {
|
|
|
list_del(&packet->list);
|
|
|
kfree(packet->buf_start);
|
|
|
kfree(packet);
|