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>

diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
index 834e29ea236c5a9c78f195ff589801d15f998950..9e6daa9c28b8f0b7200defa79add0753e76dcf26 100644 (file)
--- 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,
        return ret;
 }
 
-int ath10k_ce_sendlist_send(struct ath10k_ce_pipe *ce_state,
-                           void *per_transfer_context,
-                           unsigned int transfer_id,
-                           u32 paddr, unsigned int nbytes,
-                           u32 flags)
-{
-       struct ath10k_ce_ring *src_ring = ce_state->src_ring;
-       struct ath10k *ar = ce_state->ar;
-       struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
-       unsigned int nentries_mask = src_ring->nentries_mask;
-       unsigned int sw_index;
-       unsigned int write_index;
-       int delta, ret = -ENOMEM;
-
-       spin_lock_bh(&ar_pci->ce_lock);
-
-       sw_index = src_ring->sw_index;
-       write_index = src_ring->write_index;
-
-       delta = CE_RING_DELTA(nentries_mask, write_index, sw_index - 1);
-
-       if (delta >= 1) {
-               ret = ath10k_ce_send_nolock(ce_state, per_transfer_context,
-                                           paddr, nbytes,
-                                           transfer_id, flags);
-               if (ret)
-                       ath10k_warn("CE send failed: %d\n", ret);
-       }
-
-       spin_unlock_bh(&ar_pci->ce_lock);
-
-       return ret;
-}
-
 int ath10k_ce_recv_buf_enqueue(struct ath10k_ce_pipe *ce_state,
                               void *per_recv_context,
                               u32 buffer)

diff --git a/drivers/net/wireless/ath/ath10k/ce.h b/drivers/net/wireless/ath/ath10k/ce.h
index aec802868341b42fe86411258640086d7fd585e7..949b1744870b3d2d50c17bdc5244a363b5c6ea43 100644 (file)
--- 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,
                                void (*send_cb)(struct ath10k_ce_pipe *),
                                int disable_interrupts);
 
-/*
- * Queue a "sendlist" of buffers to be sent using gather to a single
- * anonymous destination buffer
- *   ce         - which copy engine to use
- *   sendlist        - list of simple buffers to send using gather
- *   transfer_id     - arbitrary ID; reflected to destination
- * Returns 0 on success; otherwise an error status.
- *
- * Implemenation note: Pushes multiple buffers with Gather to Source ring.
- */
-int ath10k_ce_sendlist_send(struct ath10k_ce_pipe *ce_state,
-                           void *per_transfer_context,
-                           unsigned int transfer_id,
-                           u32 paddr, unsigned int nbytes,
-                           u32 flags);
 
 /*==================Recv=======================*/
 

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index dff23d97bed065d984efac3c481ce2b06fa6e675..4f6a9787e2d32ad62e7381f126be76de37dc2269 100644 (file)
--- 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,
        pipe_info->num_sends_allowed--;
        spin_unlock_bh(&pipe_info->pipe_lock);
 
-       ret = ath10k_ce_sendlist_send(ce_hdl, nbuf, transfer_id,
-                                     skb_cb->paddr, len, flags);
+       ret = ath10k_ce_send(ce_hdl, nbuf, skb_cb->paddr, len, transfer_id,
+                            flags);
        if (ret)
                ath10k_warn("CE send failed: %p\n", nbuf);