ethdev: remove useless parameter in callback process

The pointer to the user parameter of the callback registration is
automatically pass to the callback function.
There is no point to allow changing this user parameter by a caller.
That's why this parameter is always set to NULL by PMDs and set only
in ethdev layer before calling the callback function.

The history is that the user parameter was initially used
by the callback implementation to pass some information
between the application and the driver:
	c1ceaf3ad056 ("ethdev: add an argument to internal callback function")
Then a new parameter has been added to leave the user parameter
to its standard usage of context given at registration:
	d6af1a13d7a1 ("ethdev: add return values to callback process API")

The NULL parameter in the internal callback processing function
is now removed. It makes clear that the callback parameter is user
managed and opaque from a DPDK point of view.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/doc/guides/prog_guide/poll_mode_drv.rst b/doc/guides/prog_guide/poll_mode_drv.rst
index 6a0c9f992346c681d9667305d755dbd541ee53c4..d1d4b1cb743b69a664b4679f6df1e5926c0c0256 100644 (file)
--- a/doc/guides/prog_guide/poll_mode_drv.rst
+++ b/doc/guides/prog_guide/poll_mode_drv.rst
@@ -581,8 +581,8 @@ thread safety all these operations should be called from the same thread.
 For example when PF is reset, the PF sends a message to notify VFs of
 this event and also trigger an interrupt to VFs. Then in the interrupt
 service routine the VFs detects this notification message and calls
-_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET, NULL,
-NULL). This means that a PF reset triggers an RTE_ETH_EVENT_INTR_RESET
+_rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET, NULL).
+This means that a PF reset triggers an RTE_ETH_EVENT_INTR_RESET
 event within VFs. The function _rte_eth_dev_callback_process() will
 call the registered callback function. The callback function can trigger
 the application to handle all operations the VF reset requires including

diff --git a/drivers/net/avf/avf_vchnl.c b/drivers/net/avf/avf_vchnl.c
index 3b652bf278d4ffc20c410b2467344a38bce924e4..cc347e6ea8db72a7670972773f97ebba3555601a 100644 (file)
--- a/drivers/net/avf/avf_vchnl.c
+++ b/drivers/net/avf/avf_vchnl.c
@@ -149,7 +149,7 @@ avf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
        case VIRTCHNL_EVENT_RESET_IMPENDING:
                PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_RESET_IMPENDING event");
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET,
-                                             NULL, NULL);
+                                             NULL);
                break;
        case VIRTCHNL_EVENT_LINK_CHANGE:
                PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event");
@@ -157,7 +157,7 @@ avf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
                vf->link_speed = pf_msg->event_data.link_event.link_speed;
                avf_dev_link_update(dev, 0);
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
-                                             NULL, NULL);
+                                             NULL);
                break;
        case VIRTCHNL_EVENT_PF_DRIVER_CLOSE:
                PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_PF_DRIVER_CLOSE event");

diff --git a/drivers/net/bnxt/rte_pmd_bnxt.c b/drivers/net/bnxt/rte_pmd_bnxt.c
index a3134074297971634e9bd351c1f728bf7c966f6b..e86e670dc511bd3b2f25faab2f20785e19779775 100644 (file)
--- a/drivers/net/bnxt/rte_pmd_bnxt.c
+++ b/drivers/net/bnxt/rte_pmd_bnxt.c
@@ -57,7 +57,7 @@ int bnxt_rcv_msg_from_vf(struct bnxt *bp, uint16_t vf_id, void *msg)
        ret_param.msg = msg;
 
        _rte_eth_dev_callback_process(bp->eth_dev, RTE_ETH_EVENT_VF_MBOX,
-                                     NULL, &ret_param);
+                                     &ret_param);
 
        /* Default to approve */
        if (ret_param.retval == RTE_PMD_BNXT_MB_EVENT_PROCEED)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 2e45108920f47b3f218b0fa1eb3f7b92d88aa9f8..997fffc824c7a3cc59f3be0d7e95cb703db7834a 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2592,7 +2592,7 @@ bond_ethdev_delayed_lsc_propagation(void *arg)
                return;
 
        _rte_eth_dev_callback_process((struct rte_eth_dev *)arg,
-                       RTE_ETH_EVENT_INTR_LSC, NULL, NULL);
+                       RTE_ETH_EVENT_INTR_LSC, NULL);
 }
 
 int
@@ -2700,7 +2700,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
                        else
                                _rte_eth_dev_callback_process(bonded_eth_dev,
                                                RTE_ETH_EVENT_INTR_LSC,
-                                               NULL, NULL);
+                                               NULL);
 
                } else {
                        if (internals->link_down_delay_ms > 0)
@@ -2710,7 +2710,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
                        else
                                _rte_eth_dev_callback_process(bonded_eth_dev,
                                                RTE_ETH_EVENT_INTR_LSC,
-                                               NULL, NULL);
+                                               NULL);
                }
        }
        return 0;

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 25f1a4545d445f4da4d7ebc4e2e19371d2dc6b79..821c8622ed9cc66c20cbcd27699da9fc1825bd69 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -662,7 +662,7 @@ dpaa2_interrupt_handler(void *param)
                dpaa2_dev_link_update(dev, 0);
                /* calling all the apps registered for link status event */
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
-                                             NULL, NULL);
+                                             NULL);
        }
 out:
        ret = dpni_clear_irq_status(dpni, CMD_PRI_LOW, priv->token,

diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index 78fdccfb618f630984b54513d6ef3a8089934bce..274432305d72e0fad25e0992417f2bccb1dd9b1f 100644 (file)
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -1652,7 +1652,7 @@ eth_em_interrupt_handler(void *param)
 
        eth_em_interrupt_get_status(dev);
        eth_em_interrupt_action(dev, dev->intr_handle);
-       _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL, NULL);
+       _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
 }
 
 static int

diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 060ccdc5aee7d2f6ed343759975e361f0f1922eb..52dc407061dbb2f99f67f30679269046dc67f8e5 100644 (file)
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -2892,7 +2892,7 @@ eth_igb_interrupt_action(struct rte_eth_dev *dev,
                E1000_WRITE_REG(hw, E1000_RCTL, rctl);
                E1000_WRITE_FLUSH(hw);
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
-                                             NULL, NULL);
+                                             NULL);
        }
 
        return 0;
@@ -2952,7 +2952,7 @@ void igbvf_mbx_process(struct rte_eth_dev *dev)
        /* PF reset VF event */
        if (in_msg == E1000_PF_CONTROL_MSG)
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET,
-                                             NULL, NULL);
+                                             NULL);
 }
 
 static int

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 8af0ccd3cdcf7b1849d39bc1cec718bc54c5e2b0..a9509f0682bf06dd5624031b997dc99c45a70804 100644 (file)
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -434,7 +434,7 @@ enic_intr_handler(void *arg)
        vnic_intr_return_all_credits(&enic->intr);
 
        enic_link_update(enic);
-       _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL, NULL);
+       _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
        enic_log_q_error(enic);
 }
 

diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c
index 21392e5a73fb798ba05b45b0041bb25226c1dad7..8a4cacf4aa0fa8944f94fbbe1cb457e43bd5d8f7 100644 (file)
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -480,7 +480,7 @@ failsafe_eth_lsc_event_callback(uint16_t port_id __rte_unused,
        if (ret)
                return _rte_eth_dev_callback_process(dev,
                                                     RTE_ETH_EVENT_INTR_LSC,
-                                                    NULL, NULL);
+                                                    NULL);
        else
                return 0;
 }

diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 3db21adaef632e97c19ec1b45f8bb018509bb4a2..cf8cc6a6efc26b0b25dc1c8d796d5dd1845b8ecb 100644 (file)
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -2598,7 +2598,7 @@ fm10k_dev_interrupt_handler_pf(void *param)
                        dev_info->sm_down = 0;
                        _rte_eth_dev_callback_process(dev,
                                        RTE_ETH_EVENT_INTR_LSC,
-                                       NULL, NULL);
+                                       NULL);
                }
        }
 
@@ -2611,7 +2611,7 @@ fm10k_dev_interrupt_handler_pf(void *param)
                PMD_INIT_LOG(INFO, "INT: Switch is down");
                dev_info->sm_down = 1;
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
-                               NULL, NULL);
+                               NULL);
        }
 
        /* Handle SRAM error */
@@ -2679,7 +2679,7 @@ fm10k_dev_interrupt_handler_vf(void *param)
                /* Setting reset flag */
                dev_info->sm_down = 1;
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
-                               NULL, NULL);
+                               NULL);
        }
 
        if (dev_info->sm_down == 1 &&
@@ -2708,7 +2708,7 @@ fm10k_dev_interrupt_handler_vf(void *param)
 
                dev_info->sm_down = 0;
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
-                               NULL, NULL);
+                               NULL);
        }
 
        /* Re-enable interrupt from device side */

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 27f766ade4913b06e32305cafa553b1d65bb4fdc..83bcec6a9be7d24ecf48e749f6a828cc69411824 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -6120,7 +6120,7 @@ i40e_dev_handle_aq_msg(struct rte_eth_dev *dev)
                        ret = i40e_dev_link_update(dev, 0);
                        if (!ret)
                                _rte_eth_dev_callback_process(dev,
-                                       RTE_ETH_EVENT_INTR_LSC, NULL, NULL);
+                                       RTE_ETH_EVENT_INTR_LSC, NULL);
                        break;
                default:
                        PMD_DRV_LOG(DEBUG, "Request %u is not supported yet",

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 4334010f324f167cd2c77f0602797b2e7b07cae5..86f94e926fd35f1eb93571588e95d1f34fbb376f 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1279,7 +1279,7 @@ i40evf_handle_pf_event(struct rte_eth_dev *dev, uint8_t *msg,
        case VIRTCHNL_EVENT_RESET_IMPENDING:
                PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_RESET_IMPENDING event");
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET,
-                                             NULL, NULL);
+                                             NULL);
                break;
        case VIRTCHNL_EVENT_LINK_CHANGE:
                PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event");

diff --git a/drivers/net/i40e/i40e_pf.c b/drivers/net/i40e/i40e_pf.c
index ad039035c21f57a40c94604672fef49d0137092e..e1991771577bb6bee35b714400177ef272b3072a 100644 (file)
--- a/drivers/net/i40e/i40e_pf.c
+++ b/drivers/net/i40e/i40e_pf.c
@@ -1264,8 +1264,7 @@ i40e_pf_host_handle_vf_msg(struct rte_eth_dev *dev,
         * do nothing and send not_supported to VF. As PF must send a response
         * to VF and ACK/NACK is not defined.
         */
-       _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX,
-                                     NULL, &ret_param);
+       _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX, &ret_param);
        if (ret_param.retval != RTE_PMD_I40E_MB_EVENT_PROCEED) {
                PMD_DRV_LOG(WARNING, "VF to PF message(%d) is not permitted!",
                            opcode);

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index efce458488e748f843fa5a60426ac748e62bec20..2fb9d52669a81bc3c7117eea8f753751cb690d94 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -4361,12 +4361,12 @@ ixgbe_dev_interrupt_delayed_handler(void *param)
                intr->flags &= ~IXGBE_FLAG_NEED_LINK_UPDATE;
                ixgbe_dev_link_status_print(dev);
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
-                                             NULL, NULL);
+                                             NULL);
        }
 
        if (intr->flags & IXGBE_FLAG_MACSEC) {
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_MACSEC,
-                                             NULL, NULL);
+                                             NULL);
                intr->flags &= ~IXGBE_FLAG_MACSEC;
        }
 
@@ -8149,7 +8149,7 @@ static void ixgbevf_mbx_process(struct rte_eth_dev *dev)
        /* PF reset VF event */
        if (in_msg == IXGBE_PF_CONTROL_MSG)
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET,
-                                             NULL, NULL);
+                                             NULL);
 }
 
 static int

diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c
index 9b0bd755d866d7d00a64d5b3af5a60e028a15c61..f81dc314db32cb5426e16581e559ce8fd0bdca92 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_pf.c
+++ b/drivers/net/ixgbe/ixgbe_pf.c
@@ -739,7 +739,7 @@ ixgbe_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf)
 
                /* notify application about VF reset */
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX,
-                                             NULL, &ret_param);
+                                             &ret_param);
                return ret;
        }
 
@@ -751,7 +751,7 @@ ixgbe_rcv_msg_from_vf(struct rte_eth_dev *dev, uint16_t vf)
         * if ret_param.retval > 1, do nothing and send NAK to VF
         */
        _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX,
-                                     NULL, &ret_param);
+                                     &ret_param);
 
        retval = ret_param.retval;
 

diff --git a/drivers/net/mlx4/mlx4_intr.c b/drivers/net/mlx4/mlx4_intr.c
index 50d1976985ed73c85bd5aa946d25b5bb431e2358..9becee4a88d6193a69c77984ea674de39889cfba 100644 (file)
--- a/drivers/net/mlx4/mlx4_intr.c
+++ b/drivers/net/mlx4/mlx4_intr.c
@@ -154,7 +154,7 @@ mlx4_link_status_alarm(struct priv *priv)
        if (intr_conf->lsc && !mlx4_link_status_check(priv))
                _rte_eth_dev_callback_process(priv->dev,
                                              RTE_ETH_EVENT_INTR_LSC,
-                                             NULL, NULL);
+                                             NULL);
 }
 
 /**
@@ -236,7 +236,7 @@ mlx4_interrupt_handler(struct priv *priv)
        for (i = 0; i != RTE_DIM(caught); ++i)
                if (caught[i])
                        _rte_eth_dev_callback_process(priv->dev, type[i],
-                                                     NULL, NULL);
+                                                     NULL);
 }
 
 /**

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 278a4dfc3fdd285ac750458a1486a4faa1d30f8b..79a0248a880f4906f566246092a198776c30b757 100644 (file)
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -1193,8 +1193,7 @@ mlx5_dev_link_status_handler(void *arg)
        ret = priv_link_status_update(priv);
        priv_unlock(priv);
        if (!ret)
-               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL,
-                                             NULL);
+               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
 }
 
 /**
@@ -1216,11 +1215,9 @@ mlx5_dev_interrupt_handler(void *cb_arg)
        events = priv_dev_status_handler(priv);
        priv_unlock(priv);
        if (events & (1 << RTE_ETH_EVENT_INTR_LSC))
-               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL,
-                                             NULL);
+               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
        if (events & (1 << RTE_ETH_EVENT_INTR_RMV))
-               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RMV, NULL,
-                                             NULL);
+               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RMV, NULL);
 }
 
 /**

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 4d7822f0b11033b7a8930de0b70f692f105200b9..d14f2442bfb62ba0a8bd47d0f7a3e020f53cd58e 100644 (file)
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -1472,7 +1472,7 @@ nfp_net_dev_interrupt_delayed_handler(void *param)
        struct rte_eth_dev *dev = (struct rte_eth_dev *)param;
 
        nfp_net_link_update(dev, 0);
-       _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL, NULL);
+       _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
 
        nfp_net_dev_link_status_print(dev);
 

diff --git a/drivers/net/sfc/sfc_intr.c b/drivers/net/sfc/sfc_intr.c
index 95b997a37e546d71b5b767e831101671f21d4df3..d6c84927bf331d7a12aa2b2c35edd2dda4dc29ce 100644 (file)
--- a/drivers/net/sfc/sfc_intr.c
+++ b/drivers/net/sfc/sfc_intr.c
@@ -91,7 +91,7 @@ exit:
                         "UP" : "DOWN");
                _rte_eth_dev_callback_process(sa->eth_dev,
                                              RTE_ETH_EVENT_INTR_LSC,
-                                             NULL, NULL);
+                                             NULL);
        }
 }
 
@@ -133,7 +133,7 @@ exit:
                sfc_info(sa, "link status change event");
                _rte_eth_dev_callback_process(sa->eth_dev,
                                              RTE_ETH_EVENT_INTR_LSC,
-                                             NULL, NULL);
+                                             NULL);
        }
 }
 

diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c
index 4ca2ff61cae5c60b4ea1604b0ecbbb1a98f94ddf..b9a873f2f75b1bf1323645199d552809b28c58bc 100644 (file)
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -106,7 +106,7 @@ nicvf_interrupt(void *arg)
                if (dev->data->dev_conf.intr_conf.lsc)
                        nicvf_set_eth_link_status(nic, &dev->data->dev_link);
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
-                                             NULL, NULL);
+                                             NULL);
        }
 
        rte_eal_alarm_set(NICVF_INTR_POLL_INTERVAL_MS * 1000,

diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
index 2536ee4a2f99eadce11e4d0d126c20593d2557cc..0144285801f7fd25c828b7a797d3e7d6b07da76a 100644 (file)
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -609,8 +609,7 @@ new_device(int vid)
 
        RTE_LOG(INFO, PMD, "New connection established\n");
 
-       _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC,
-                                     NULL, NULL);
+       _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
 
        return 0;
 }
@@ -664,8 +663,7 @@ destroy_device(int vid)
 
        RTE_LOG(INFO, PMD, "Connection closed\n");
 
-       _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC,
-                                     NULL, NULL);
+       _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
 }
 
 static int
@@ -694,8 +692,7 @@ vring_state_changed(int vid, uint16_t vring, int enable)
        RTE_LOG(INFO, PMD, "vring%u is %s\n",
                        vring, enable ? "enabled" : "disabled");
 
-       _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_QUEUE_STATE,
-                                     NULL, NULL);
+       _rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_QUEUE_STATE, NULL);
 
        return 0;
 }

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index ee0cb3dd294bd03416c74a86a85867a2b0ebf25e..ebb968c4bbfcf21abf5f7f7306675af9db798f58 100644 (file)
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1240,7 +1240,7 @@ virtio_interrupt_handler(void *param)
                if (virtio_dev_link_update(dev, 0) == 0)
                        _rte_eth_dev_callback_process(dev,
                                                      RTE_ETH_EVENT_INTR_LSC,
-                                                     NULL, NULL);
+                                                     NULL);
        }
 
 }

diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 4bc0a265f83dc78ce7a5106361880b42c0d5fd35..a34a6f92488c609ed78a974c009567b8b7a62c82 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -1306,7 +1306,7 @@ vmxnet3_process_events(struct rte_eth_dev *dev)
                if (vmxnet3_dev_link_update(dev, 0) == 0)
                        _rte_eth_dev_callback_process(dev,
                                                      RTE_ETH_EVENT_INTR_LSC,
-                                                     NULL, NULL);
+                                                     NULL);
        }
 
        /* Check if there is an error on xmit/recv queues */

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 394aa26a5c3a1aed4fdbfa80ef9d6890d2518dae..9e6d798770632bc9ed05f3b3a59f0824e65c4be8 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -2935,7 +2935,7 @@ rte_eth_dev_callback_unregister(uint16_t port_id,
 
 int
 _rte_eth_dev_callback_process(struct rte_eth_dev *dev,
-       enum rte_eth_event_type event, void *cb_arg, void *ret_param)
+       enum rte_eth_event_type event, void *ret_param)
 {
        struct rte_eth_dev_callback *cb_lst;
        struct rte_eth_dev_callback dev_cb;
@@ -2947,8 +2947,6 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev,
                        continue;
                dev_cb = *cb_lst;
                cb_lst->active = 1;
-               if (cb_arg != NULL)
-                       dev_cb.cb_arg = cb_arg;
                if (ret_param != NULL)
                        dev_cb.ret_param = ret_param;
 

diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index eaa0e1563852a27e3f4bf7593f3118e556586735..ba1158bdeb3dce3e3ccb0988735f29b25ab3aa15 100644 (file)
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -3556,8 +3556,6 @@ int rte_eth_dev_callback_unregister(uint16_t port_id,
  *  Pointer to struct rte_eth_dev.
  * @param event
  *  Eth device interrupt event type.
- * @param cb_arg
- *  callback parameter.
  * @param ret_param
  *  To pass data back to user application.
  *  This allows the user application to decide if a particular function
@@ -3567,7 +3565,7 @@ int rte_eth_dev_callback_unregister(uint16_t port_id,
  *  int
  */
 int _rte_eth_dev_callback_process(struct rte_eth_dev *dev,
-               enum rte_eth_event_type event, void *cb_arg, void *ret_param);
+               enum rte_eth_event_type event, void *ret_param);
 
 /**
  * When there is no rx packet coming in Rx Queue for a long time, we can

diff --git a/test/test/virtual_pmd.c b/test/test/virtual_pmd.c
index 5c71ba763424a7a86f8347362604027de8aef0be..ad4ff3931b6eededd76ddc72af020b176148ab92 100644 (file)
--- a/test/test/virtual_pmd.c
+++ b/test/test/virtual_pmd.c
@@ -460,7 +460,7 @@ virtual_ethdev_simulate_link_status_interrupt(uint16_t port_id,
        vrtl_eth_dev->data->dev_link.link_status = link_status;
 
        _rte_eth_dev_callback_process(vrtl_eth_dev, RTE_ETH_EVENT_INTR_LSC,
-                                     NULL, NULL);
+                                     NULL);
 }
 
 int