ethdev: remove legacy Rx descriptor done API

[dpdk.git] / drivers / net / sfc / sfc_ethdev.c

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 2db0d00..7d1d7b1 100644 (file)
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -504,9 +504,9 @@ fail_rx_qinit:
 }
 
 static void
-sfc_rx_queue_release(void *queue)
+sfc_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
 {
-       struct sfc_dp_rxq *dp_rxq = queue;
+       struct sfc_dp_rxq *dp_rxq = dev->data->rx_queues[qid];
        struct sfc_rxq *rxq;
        struct sfc_adapter *sa;
        sfc_sw_index_t sw_index;
@@ -561,9 +561,9 @@ fail_tx_qinit:
 }
 
 static void
-sfc_tx_queue_release(void *queue)
+sfc_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
 {
-       struct sfc_dp_txq *dp_txq = queue;
+       struct sfc_dp_txq *dp_txq = dev->data->tx_queues[qid];
        struct sfc_txq *txq;
        sfc_sw_index_t sw_index;
        struct sfc_adapter *sa;
@@ -838,8 +838,9 @@ sfc_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
 
 static int
 sfc_xstats_get_names_by_id(struct rte_eth_dev *dev,
+                          const uint64_t *ids,
                           struct rte_eth_xstat_name *xstats_names,
-                          const uint64_t *ids, unsigned int size)
+                          unsigned int size)
 {
        struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);
        struct sfc_port *port = &sa->port;
@@ -1296,21 +1297,6 @@ sfc_rx_queue_count(struct rte_eth_dev *dev, uint16_t ethdev_qid)
        return sap->dp_rx->qdesc_npending(rxq_info->dp);
 }
 
-/*
- * The function is used by the secondary process as well. It must not
- * use any process-local pointers from the adapter data.
- */
-static int
-sfc_rx_descriptor_done(void *queue, uint16_t offset)
-{
-       struct sfc_dp_rxq *dp_rxq = queue;
-       const struct sfc_dp_rx *dp_rx;
-
-       dp_rx = sfc_dp_rx_by_dp_rxq(dp_rxq);
-
-       return offset < dp_rx->qdesc_npending(dp_rxq);
-}
-
 /*
  * The function is used by the secondary process as well. It must not
  * use any process-local pointers from the adapter data.
@@ -2045,7 +2031,6 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev)
        dev->tx_pkt_burst = dp_tx->pkt_burst;
 
        dev->rx_queue_count = sfc_rx_queue_count;
-       dev->rx_descriptor_done = sfc_rx_descriptor_done;
        dev->rx_descriptor_status = sfc_rx_descriptor_status;
        dev->tx_descriptor_status = sfc_tx_descriptor_status;
        dev->dev_ops = &sfc_eth_dev_ops;
@@ -2153,7 +2138,6 @@ sfc_eth_dev_secondary_init(struct rte_eth_dev *dev, uint32_t logtype_main)
        dev->tx_pkt_prepare = dp_tx->pkt_prepare;
        dev->tx_pkt_burst = dp_tx->pkt_burst;
        dev->rx_queue_count = sfc_rx_queue_count;
-       dev->rx_descriptor_done = sfc_rx_descriptor_done;
        dev->rx_descriptor_status = sfc_rx_descriptor_status;
        dev->tx_descriptor_status = sfc_tx_descriptor_status;
        dev->dev_ops = &sfc_eth_dev_secondary_ops;