bus/fslmc: remove unused funcs and align names in QBMAN

[dpdk.git] / drivers / net / dpaa2 / dpaa2_rxtx.c

diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index 4342c73..75a06f5 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -422,7 +422,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                qbman_pull_desc_set_storage(&pulldesc, dq_storage,
                        (dma_addr_t)(DPAA2_VADDR_TO_IOVA(dq_storage)), 1);
                if (check_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)) {
-                       while (!qbman_check_command_complete(swp,
+                       while (!qbman_check_command_complete(
                               get_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)))
                                ;
                        clear_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index);
@@ -445,7 +445,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
         * Also seems like the SWP is shared between the Ethernet Driver
         * and the SEC driver.
         */
-       while (!qbman_check_command_complete(swp, dq_storage))
+       while (!qbman_check_command_complete(dq_storage))
                ;
        if (dq_storage == get_swp_active_dqs(q_storage->active_dpio_id))
                clear_swp_active_dqs(q_storage->active_dpio_id);
@@ -453,7 +453,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                /* Loop until the dq_storage is updated with
                 * new token by QBMAN
                 */
-               while (!qbman_result_has_new_result(swp, dq_storage))
+               while (!qbman_check_new_result(dq_storage))
                        ;
                rte_prefetch0((void *)((uint64_t)(dq_storage + 1)));
                /* Check whether Last Pull command is Expired and
@@ -486,7 +486,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
        }
 
        if (check_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)) {
-               while (!qbman_check_command_complete(swp,
+               while (!qbman_check_command_complete(
                       get_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)))
                        ;
                clear_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index);
@@ -560,7 +560,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
        while (nb_pkts) {
                /*Check if the queue is congested*/
                retry_count = 0;
-               if (qbman_result_SCN_state_in_mem(dpaa2_q->cscn)) {
+               while (qbman_result_SCN_state(dpaa2_q->cscn)) {
                        retry_count++;
                        /* Retry for some time before giving up */
                        if (retry_count > CONG_RETRY_COUNT)