diff options
author | Michal Kazior <michal.kazior@tieto.com> | 2013-10-02 05:03:40 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2013-10-07 08:28:02 -0400 |
commit | 2e761b5a5222071d55ebccf65f93d281e4c11958 (patch) | |
tree | c352ad484bafdfc69d96d66dbd9b6d7c7d24c80d /drivers/net | |
parent | ddb6ad77b4ecfb832982be69f2169165e6a43f0b (diff) |
ath10k: remove ce_sendlist_send
It is completely pointless to keep this function
around. It doesn't do anything different than
ce_send except it introduces more overhead.
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath10k/ce.c | 34 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath10k/ce.h | 15 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath10k/pci.c | 4 |
3 files changed, 2 insertions, 51 deletions
diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c index 834e29ea236c..9e6daa9c28b8 100644 --- a/drivers/net/wireless/ath/ath10k/ce.c +++ b/drivers/net/wireless/ath/ath10k/ce.c | |||
@@ -338,40 +338,6 @@ int ath10k_ce_send(struct ath10k_ce_pipe *ce_state, | |||
338 | return ret; | 338 | return ret; |
339 | } | 339 | } |
340 | 340 | ||
341 | int ath10k_ce_sendlist_send(struct ath10k_ce_pipe *ce_state, | ||
342 | void *per_transfer_context, | ||
343 | unsigned int transfer_id, | ||
344 | u32 paddr, unsigned int nbytes, | ||
345 | u32 flags) | ||
346 | { | ||
347 | struct ath10k_ce_ring *src_ring = ce_state->src_ring; | ||
348 | struct ath10k *ar = ce_state->ar; | ||
349 | struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); | ||
350 | unsigned int nentries_mask = src_ring->nentries_mask; | ||
351 | unsigned int sw_index; | ||
352 | unsigned int write_index; | ||
353 | int delta, ret = -ENOMEM; | ||
354 | |||
355 | spin_lock_bh(&ar_pci->ce_lock); | ||
356 | |||
357 | sw_index = src_ring->sw_index; | ||
358 | write_index = src_ring->write_index; | ||
359 | |||
360 | delta = CE_RING_DELTA(nentries_mask, write_index, sw_index - 1); | ||
361 | |||
362 | if (delta >= 1) { | ||
363 | ret = ath10k_ce_send_nolock(ce_state, per_transfer_context, | ||
364 | paddr, nbytes, | ||
365 | transfer_id, flags); | ||
366 | if (ret) | ||
367 | ath10k_warn("CE send failed: %d\n", ret); | ||
368 | } | ||
369 | |||
370 | spin_unlock_bh(&ar_pci->ce_lock); | ||
371 | |||
372 | return ret; | ||
373 | } | ||
374 | |||
375 | int ath10k_ce_recv_buf_enqueue(struct ath10k_ce_pipe *ce_state, | 341 | int ath10k_ce_recv_buf_enqueue(struct ath10k_ce_pipe *ce_state, |
376 | void *per_recv_context, | 342 | void *per_recv_context, |
377 | u32 buffer) | 343 | u32 buffer) |
diff --git a/drivers/net/wireless/ath/ath10k/ce.h b/drivers/net/wireless/ath/ath10k/ce.h index aec802868341..949b1744870b 100644 --- a/drivers/net/wireless/ath/ath10k/ce.h +++ b/drivers/net/wireless/ath/ath10k/ce.h | |||
@@ -156,21 +156,6 @@ void ath10k_ce_send_cb_register(struct ath10k_ce_pipe *ce_state, | |||
156 | void (*send_cb)(struct ath10k_ce_pipe *), | 156 | void (*send_cb)(struct ath10k_ce_pipe *), |
157 | int disable_interrupts); | 157 | int disable_interrupts); |
158 | 158 | ||
159 | /* | ||
160 | * Queue a "sendlist" of buffers to be sent using gather to a single | ||
161 | * anonymous destination buffer | ||
162 | * ce - which copy engine to use | ||
163 | * sendlist - list of simple buffers to send using gather | ||
164 | * transfer_id - arbitrary ID; reflected to destination | ||
165 | * Returns 0 on success; otherwise an error status. | ||
166 | * | ||
167 | * Implemenation note: Pushes multiple buffers with Gather to Source ring. | ||
168 | */ | ||
169 | int ath10k_ce_sendlist_send(struct ath10k_ce_pipe *ce_state, | ||
170 | void *per_transfer_context, | ||
171 | unsigned int transfer_id, | ||
172 | u32 paddr, unsigned int nbytes, | ||
173 | u32 flags); | ||
174 | 159 | ||
175 | /*==================Recv=======================*/ | 160 | /*==================Recv=======================*/ |
176 | 161 | ||
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index dff23d97bed0..4f6a9787e2d3 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c | |||
@@ -730,8 +730,8 @@ static int ath10k_pci_hif_send_head(struct ath10k *ar, u8 pipe_id, | |||
730 | pipe_info->num_sends_allowed--; | 730 | pipe_info->num_sends_allowed--; |
731 | spin_unlock_bh(&pipe_info->pipe_lock); | 731 | spin_unlock_bh(&pipe_info->pipe_lock); |
732 | 732 | ||
733 | ret = ath10k_ce_sendlist_send(ce_hdl, nbuf, transfer_id, | 733 | ret = ath10k_ce_send(ce_hdl, nbuf, skb_cb->paddr, len, transfer_id, |
734 | skb_cb->paddr, len, flags); | 734 | flags); |
735 | if (ret) | 735 | if (ret) |
736 | ath10k_warn("CE send failed: %p\n", nbuf); | 736 | ath10k_warn("CE send failed: %p\n", nbuf); |
737 | 737 | ||