With proactive device reset introduced, gve_init_priv is now only called during initial device probe with skip_describe_device set to false. Remove the unused skip_describe_device parameter and its associated conditional branches.
Signed-off-by: Jasper Tran O'Leary <[email protected]> Reviewed-by: Joshua Washington <[email protected]> --- drivers/net/gve/gve_ethdev.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c index 66a77c123..c2cfd18dc 100644 --- a/drivers/net/gve/gve_ethdev.c +++ b/drivers/net/gve/gve_ethdev.c @@ -1973,7 +1973,7 @@ static const struct gve_ctrl_ops gve_adminq_ops = { }; static int -gve_init_priv(struct gve_priv *priv, bool skip_describe_device) +gve_init_priv(struct gve_priv *priv) { struct gve_process_private *process_priv; int num_ntfy; @@ -1987,9 +1987,6 @@ gve_init_priv(struct gve_priv *priv, bool skip_describe_device) return err; } - if (skip_describe_device) - goto setup_device; - /* Set default descriptor counts */ gve_set_default_ring_size_bounds(priv); @@ -2057,7 +2054,6 @@ gve_init_priv(struct gve_priv *priv, bool skip_describe_device) goto free_queue_configs; } -setup_device: if (process_priv->ctrl_ops->query_rss != NULL) priv->rss_cache_dirty = true; if (priv->max_flow_rules) { @@ -2080,16 +2076,14 @@ free_flow_subsystem: if (gve_get_flow_subsystem_ok(priv)) gve_teardown_flow_subsystem(priv); free_queue_configs: - if (!skip_describe_device) { - rte_free(priv->zombie_tx_queues); - priv->zombie_tx_queues = NULL; - rte_free(priv->zombie_rx_queues); - priv->zombie_rx_queues = NULL; - rte_free(priv->txq_configs); - priv->txq_configs = NULL; - rte_free(priv->rxq_configs); - priv->rxq_configs = NULL; - } + rte_free(priv->zombie_tx_queues); + priv->zombie_tx_queues = NULL; + rte_free(priv->zombie_rx_queues); + priv->zombie_rx_queues = NULL; + rte_free(priv->txq_configs); + priv->txq_configs = NULL; + rte_free(priv->rxq_configs); + priv->rxq_configs = NULL; free_ctrl_plane: process_priv->ctrl_ops->free_ctrl_plane(priv); gve_free_device_resources(priv); @@ -2164,7 +2158,7 @@ gve_dev_init(struct rte_eth_dev *eth_dev) pthread_mutexattr_destroy(&mutexattr); priv->mbuf_timestamp_offset = -1; - err = gve_init_priv(priv, false); + err = gve_init_priv(priv); if (err) { pthread_mutex_destroy(&priv->flow_rule_lock); pthread_mutex_destroy(&priv->nic_ts_lock); -- 2.56.0.307.g5fe7bd680c-goog
