From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9F52546280; Thu, 20 Feb 2025 17:57:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E1D6A402DB; Thu, 20 Feb 2025 17:57:05 +0100 (CET) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mails.dpdk.org (Postfix) with ESMTP id 24A06402CC for ; Thu, 20 Feb 2025 17:57:04 +0100 (CET) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2211cd4463cso24648135ad.2 for ; Thu, 20 Feb 2025 08:57:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1740070623; x=1740675423; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vpDqjaJ5qcGro+AWGpe6QJPY9exJ21eGz4CFIPbU2OU=; b=d/zzLyePzymhDgO5sO2tEk+tl1ManoXxw+bZQVG+wxav+pU0Y6Og91gpIecRGVGNJ2 hU2OLbgEuUdQEin6rT8pxPekXPaC/M2YmHJT01QUIdBbRuRD0NRX2Q4KIY4hO2JoQ8en 2YtoHPFlpEQ1N1V/zGVjLfUt0yoMOGA17kBtac2aV+XGuKL4pxgnBz5Whgfou3xECUUi zOHFs6JXvsir3mmo0+5exMWgIbpCDYmAUK8JRfZJk+KOTozGZjPkMej0UIIN4jcYLV3Z 0bu4GcGqytwUrcTX0sbvJC/EV7Zm648Hbg7+/7cxF5tv0s6Z6hEObbVdAZU//SHDfNjr QolQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740070623; x=1740675423; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vpDqjaJ5qcGro+AWGpe6QJPY9exJ21eGz4CFIPbU2OU=; b=EO6g0s/VdGBImzbrWlTCNBPaWxhRG6/uDbvUI9eCnvbLreZlhUZxa/4+oM4qsxyX6Q /aIoyyMhL+I6oCZs9ZJV2U8BLHIZoNx58Zln3I40VMsJUGvmJ9AjVLnhIv8q1/XXeaWo vq1Uhpw6Qr8EEUzXe1W4qLzYOpE1r7nSomkeCC/nxCKV/muz9JiC1yIOvlKXu76JmH+C QRNAg+XP6rpC7IG2HlityBBCTNHnhRslizHkz2SknXRgqKqsImcv5UWBRiP4CGSP+VgF Tcb6Zj3+GXCP2I0aYdDxlDmqERHUWyRxXSsj2+Yui02/jvg+xy9ZYERqS9Xw3Be36bcc eYcA== X-Gm-Message-State: AOJu0Yxpwqy8nSFgfluiq8YwZqlFSYg4rIMJh9bSOSKAl4v7CxNZv9GE 45wGDXw/jh0rIptrlRH7Jql0knbqKu91/BDyEcha3F3FpPXUo3rO9nrMovXhiw0DBoca0xU/3iL t X-Gm-Gg: ASbGnct0RXsYK36beey/aLau91kk+xi+A8XaMSoMJko+dfZk213Z6wO4Z7UfB29BMCF 0ZG7vtjNUiYyPOnjX4XasC7P2CaRI3vnWsRz1mRA9ONgdvkOMMOQS0ll5ondKBaRj8AUhnYY6Be c3Uvwft1PKRMeIYSTzTmoaILs2C3FrfnH0kXX4YA5Au7hZ5I2V+k8Ul0X6wp3C3Heaw9D9PZCIC Hesb6WqO/1mlSA3RdSBjDqV/4G3V+UQsAt5/yvd6yTF9WSyPn7EWBQlQgy9JImhoI+3enrGfzYu D0/Tn1C/x7j1H+yZ26PjrzMd7fe7qLCy0wNPWW8V1YU5Ij9OqVHnYZ3PjWaRebz+DEAl X-Google-Smtp-Source: AGHT+IGKAipeK+IqhyjafHT9Hi0Yn4joFSaEpto0DogG6kfJ9+UH7XJXW/9An+6QDZleDdTZkoN/TQ== X-Received: by 2002:a17:902:d502:b0:21f:3e2d:7d42 with SMTP id d9443c01a7336-221040620a5mr360504205ad.23.1740070622738; Thu, 20 Feb 2025 08:57:02 -0800 (PST) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d53491b3sm122729435ad.40.2025.02.20.08.57.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 08:57:02 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Andrew Rybchenko , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Bruce Richardson , Thomas Monjalon , Ferruh Yigit Subject: [PATCH v3 01/14] ethdev: remove unnecessary deref on function pointers Date: Thu, 20 Feb 2025 08:55:15 -0800 Message-ID: <20250220165644.16421-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250220165644.16421-1-stephen@networkplumber.org> References: <20250217185743.169778-1-stephen@networkplumber.org> <20250220165644.16421-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The expression *dev->dev_ops->rx_queue_start and dev->dev_ops->rx_queue_start are equivalent. Remove the unnecessary asterisk and parenthesis. Signed-off-by: Stephen Hemminger Reviewed-by: Andrew Rybchenko Acked-by: Morten Brørup Acked-by: Bruce Richardson --- lib/ethdev/ethdev_driver.c | 16 +- lib/ethdev/ethdev_private.c | 4 +- lib/ethdev/rte_ethdev.c | 494 ++++++++++++++++------------------- lib/ethdev/rte_ethdev.h | 12 +- lib/ethdev/rte_ethdev_cman.c | 8 +- 5 files changed, 251 insertions(+), 283 deletions(-) diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c index 13d328d97b..e1976db05f 100644 --- a/lib/ethdev/ethdev_driver.c +++ b/lib/ethdev/ethdev_driver.c @@ -749,11 +749,10 @@ rte_eth_hairpin_queue_peer_bind(uint16_t cur_port, uint16_t cur_queue, /* No need to check the validity again. */ dev = &rte_eth_devices[cur_port]; - if (*dev->dev_ops->hairpin_queue_peer_bind == NULL) + if (dev->dev_ops->hairpin_queue_peer_bind == NULL) return -ENOTSUP; - return (*dev->dev_ops->hairpin_queue_peer_bind)(dev, cur_queue, - peer_info, direction); + return dev->dev_ops->hairpin_queue_peer_bind(dev, cur_queue, peer_info, direction); } int @@ -764,11 +763,10 @@ rte_eth_hairpin_queue_peer_unbind(uint16_t cur_port, uint16_t cur_queue, /* No need to check the validity again. */ dev = &rte_eth_devices[cur_port]; - if (*dev->dev_ops->hairpin_queue_peer_unbind == NULL) + if (dev->dev_ops->hairpin_queue_peer_unbind == NULL) return -ENOTSUP; - return (*dev->dev_ops->hairpin_queue_peer_unbind)(dev, cur_queue, - direction); + return dev->dev_ops->hairpin_queue_peer_unbind(dev, cur_queue, direction); } int @@ -785,11 +783,11 @@ rte_eth_hairpin_queue_peer_update(uint16_t peer_port, uint16_t peer_queue, /* No need to check the validity again. */ dev = &rte_eth_devices[peer_port]; - if (*dev->dev_ops->hairpin_queue_peer_update == NULL) + if (dev->dev_ops->hairpin_queue_peer_update == NULL) return -ENOTSUP; - return (*dev->dev_ops->hairpin_queue_peer_update)(dev, peer_queue, - cur_info, peer_info, direction); + return dev->dev_ops->hairpin_queue_peer_update(dev, peer_queue, + cur_info, peer_info, direction); } int diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c index eed8c78747..cc7fd97d4a 100644 --- a/lib/ethdev/ethdev_private.c +++ b/lib/ethdev/ethdev_private.c @@ -398,7 +398,7 @@ eth_dev_rxq_release(struct rte_eth_dev *dev, uint16_t qid) return; if (dev->dev_ops->rx_queue_release != NULL) - (*dev->dev_ops->rx_queue_release)(dev, qid); + dev->dev_ops->rx_queue_release(dev, qid); rxq[qid] = NULL; } @@ -411,7 +411,7 @@ eth_dev_txq_release(struct rte_eth_dev *dev, uint16_t qid) return; if (dev->dev_ops->tx_queue_release != NULL) - (*dev->dev_ops->tx_queue_release)(dev, qid); + dev->dev_ops->tx_queue_release(dev, qid); txq[qid] = NULL; } diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index c4079bb924..162a6902ee 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -859,7 +859,7 @@ rte_eth_dev_rx_queue_start(uint16_t port_id, uint16_t rx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_start == NULL) + if (dev->dev_ops->rx_queue_start == NULL) return -ENOTSUP; if (rte_eth_dev_is_rx_hairpin_queue(dev, rx_queue_id)) { @@ -896,7 +896,7 @@ rte_eth_dev_rx_queue_stop(uint16_t port_id, uint16_t rx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_stop == NULL) + if (dev->dev_ops->rx_queue_stop == NULL) return -ENOTSUP; if (rte_eth_dev_is_rx_hairpin_queue(dev, rx_queue_id)) { @@ -940,7 +940,7 @@ rte_eth_dev_tx_queue_start(uint16_t port_id, uint16_t tx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->tx_queue_start == NULL) + if (dev->dev_ops->tx_queue_start == NULL) return -ENOTSUP; if (rte_eth_dev_is_tx_hairpin_queue(dev, tx_queue_id)) { @@ -977,7 +977,7 @@ rte_eth_dev_tx_queue_stop(uint16_t port_id, uint16_t tx_queue_id) if (ret != 0) return ret; - if (*dev->dev_ops->tx_queue_stop == NULL) + if (dev->dev_ops->tx_queue_stop == NULL) return -ENOTSUP; if (rte_eth_dev_is_tx_hairpin_queue(dev, tx_queue_id)) { @@ -1308,7 +1308,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, return -EINVAL; } - if (*dev->dev_ops->dev_configure == NULL) + if (dev->dev_ops->dev_configure == NULL) return -ENOTSUP; if (dev->data->dev_started) { @@ -1567,7 +1567,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, goto rollback; } - diag = (*dev->dev_ops->dev_configure)(dev); + diag = dev->dev_ops->dev_configure(dev); if (diag != 0) { RTE_ETHDEV_LOG_LINE(ERR, "Port%u dev_configure = %d", port_id, diag); @@ -1630,12 +1630,12 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, /* replay MAC address configuration including default MAC */ addr = &dev->data->mac_addrs[0]; - if (*dev->dev_ops->mac_addr_set != NULL) - (*dev->dev_ops->mac_addr_set)(dev, addr); - else if (*dev->dev_ops->mac_addr_add != NULL) - (*dev->dev_ops->mac_addr_add)(dev, addr, 0, pool); + if (dev->dev_ops->mac_addr_set != NULL) + dev->dev_ops->mac_addr_set(dev, addr); + else if (dev->dev_ops->mac_addr_add != NULL) + dev->dev_ops->mac_addr_add(dev, addr, 0, pool); - if (*dev->dev_ops->mac_addr_add != NULL) { + if (dev->dev_ops->mac_addr_add != NULL) { for (i = 1; i < dev_info->max_mac_addrs; i++) { addr = &dev->data->mac_addrs[i]; @@ -1648,8 +1648,7 @@ eth_dev_mac_restore(struct rte_eth_dev *dev, do { if (pool_mask & UINT64_C(1)) - (*dev->dev_ops->mac_addr_add)(dev, - addr, i, pool); + dev->dev_ops->mac_addr_add(dev, addr, i, pool); pool_mask >>= 1; pool++; } while (pool_mask); @@ -1668,9 +1667,8 @@ eth_dev_promiscuous_restore(struct rte_eth_dev *dev, uint16_t port_id) * would like to bypass the same value set */ if (rte_eth_promiscuous_get(port_id) == 1 && - *dev->dev_ops->promiscuous_enable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->promiscuous_enable)(dev)); + dev->dev_ops->promiscuous_enable != NULL) { + ret = eth_err(port_id, dev->dev_ops->promiscuous_enable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to enable promiscuous mode for device (port %u): %s", @@ -1678,9 +1676,8 @@ eth_dev_promiscuous_restore(struct rte_eth_dev *dev, uint16_t port_id) return ret; } } else if (rte_eth_promiscuous_get(port_id) == 0 && - *dev->dev_ops->promiscuous_disable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->promiscuous_disable)(dev)); + dev->dev_ops->promiscuous_disable != NULL) { + ret = eth_err(port_id, dev->dev_ops->promiscuous_disable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to disable promiscuous mode for device (port %u): %s", @@ -1703,9 +1700,8 @@ eth_dev_allmulticast_restore(struct rte_eth_dev *dev, uint16_t port_id) * would like to bypass the same value set */ if (rte_eth_allmulticast_get(port_id) == 1 && - *dev->dev_ops->allmulticast_enable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->allmulticast_enable)(dev)); + dev->dev_ops->allmulticast_enable != NULL) { + ret = eth_err(port_id, dev->dev_ops->allmulticast_enable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to enable allmulticast mode for device (port %u): %s", @@ -1713,9 +1709,8 @@ eth_dev_allmulticast_restore(struct rte_eth_dev *dev, uint16_t port_id) return ret; } } else if (rte_eth_allmulticast_get(port_id) == 0 && - *dev->dev_ops->allmulticast_disable != NULL) { - ret = eth_err(port_id, - (*dev->dev_ops->allmulticast_disable)(dev)); + dev->dev_ops->allmulticast_disable != NULL) { + ret = eth_err(port_id, dev->dev_ops->allmulticast_disable(dev)); if (ret != 0 && ret != -ENOTSUP) { RTE_ETHDEV_LOG_LINE(ERR, "Failed to disable allmulticast mode for device (port %u): %s", @@ -1766,7 +1761,7 @@ rte_eth_dev_start(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_start == NULL) + if (dev->dev_ops->dev_start == NULL) return -ENOTSUP; if (dev->data->dev_configured == 0) { @@ -1794,7 +1789,7 @@ rte_eth_dev_start(uint16_t port_id) (restore_flags & RTE_ETH_RESTORE_MAC_ADDR)) eth_dev_mac_restore(dev, &dev_info); - diag = (*dev->dev_ops->dev_start)(dev); + diag = dev->dev_ops->dev_start(dev); if (diag == 0) dev->data->dev_started = 1; else @@ -1816,9 +1811,9 @@ rte_eth_dev_start(uint16_t port_id) } if (dev->data->dev_conf.intr_conf.lsc == 0) { - if (*dev->dev_ops->link_update == NULL) + if (dev->dev_ops->link_update == NULL) return -ENOTSUP; - (*dev->dev_ops->link_update)(dev, 0); + dev->dev_ops->link_update(dev, 0); } /* expose selection of PMD fast-path functions */ @@ -1837,7 +1832,7 @@ rte_eth_dev_stop(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_stop == NULL) + if (dev->dev_ops->dev_stop == NULL) return -ENOTSUP; if (dev->data->dev_started == 0) { @@ -1850,7 +1845,7 @@ rte_eth_dev_stop(uint16_t port_id) /* point fast-path functions to dummy ones */ eth_dev_fp_ops_reset(rte_eth_fp_ops + port_id); - ret = (*dev->dev_ops->dev_stop)(dev); + ret = dev->dev_ops->dev_stop(dev); if (ret == 0) dev->data->dev_started = 0; rte_ethdev_trace_stop(port_id, ret); @@ -1867,9 +1862,9 @@ rte_eth_dev_set_link_up(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_set_link_up == NULL) + if (dev->dev_ops->dev_set_link_up == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_set_link_up)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_set_link_up(dev)); rte_ethdev_trace_set_link_up(port_id, ret); @@ -1885,9 +1880,9 @@ rte_eth_dev_set_link_down(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_set_link_down == NULL) + if (dev->dev_ops->dev_set_link_down == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_set_link_down)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_set_link_down(dev)); rte_ethdev_trace_set_link_down(port_id, ret); @@ -1902,9 +1897,9 @@ rte_eth_speed_lanes_get(uint16_t port_id, uint32_t *lane) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->speed_lanes_get == NULL) + if (dev->dev_ops->speed_lanes_get == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->speed_lanes_get)(dev, lane)); + return eth_err(port_id, dev->dev_ops->speed_lanes_get(dev, lane)); } int @@ -1918,7 +1913,7 @@ rte_eth_speed_lanes_get_capability(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->speed_lanes_get_capa == NULL) + if (dev->dev_ops->speed_lanes_get_capa == NULL) return -ENOTSUP; if (speed_lanes_capa == NULL && num > 0) { @@ -1928,7 +1923,7 @@ rte_eth_speed_lanes_get_capability(uint16_t port_id, return -EINVAL; } - ret = (*dev->dev_ops->speed_lanes_get_capa)(dev, speed_lanes_capa, num); + ret = dev->dev_ops->speed_lanes_get_capa(dev, speed_lanes_capa, num); return ret; } @@ -1941,9 +1936,9 @@ rte_eth_speed_lanes_set(uint16_t port_id, uint32_t speed_lanes_capa) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->speed_lanes_set == NULL) + if (dev->dev_ops->speed_lanes_set == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->speed_lanes_set)(dev, speed_lanes_capa)); + return eth_err(port_id, dev->dev_ops->speed_lanes_set(dev, speed_lanes_capa)); } int @@ -1968,9 +1963,9 @@ rte_eth_dev_close(uint16_t port_id) return -EINVAL; } - if (*dev->dev_ops->dev_close == NULL) + if (dev->dev_ops->dev_close == NULL) return -ENOTSUP; - *lasterr = (*dev->dev_ops->dev_close)(dev); + *lasterr = dev->dev_ops->dev_close(dev); if (*lasterr != 0) lasterr = &binerr; @@ -1989,7 +1984,7 @@ rte_eth_dev_reset(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_reset == NULL) + if (dev->dev_ops->dev_reset == NULL) return -ENOTSUP; ret = rte_eth_dev_stop(port_id); @@ -2017,7 +2012,7 @@ rte_eth_dev_is_removed(uint16_t port_id) if (dev->state == RTE_ETH_DEV_REMOVED) return 1; - if (*dev->dev_ops->is_removed == NULL) + if (dev->dev_ops->is_removed == NULL) return 0; ret = dev->dev_ops->is_removed(dev); @@ -2254,7 +2249,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, return -EINVAL; } - if (*dev->dev_ops->rx_queue_setup == NULL) + if (dev->dev_ops->rx_queue_setup == NULL) return -ENOTSUP; if (rx_conf != NULL && @@ -2436,8 +2431,8 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, return ret; } - ret = (*dev->dev_ops->rx_queue_setup)(dev, rx_queue_id, nb_rx_desc, - socket_id, &local_conf, mp); + ret = dev->dev_ops->rx_queue_setup(dev, rx_queue_id, nb_rx_desc, + socket_id, &local_conf, mp); if (!ret) { if (!dev->data->min_rx_buf_size || dev->data->min_rx_buf_size > mbp_buf_size) @@ -2484,7 +2479,7 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id, uint16_t rx_queue_id, ret = rte_eth_dev_hairpin_capability_get(port_id, &cap); if (ret != 0) return ret; - if (*dev->dev_ops->rx_hairpin_queue_setup == NULL) + if (dev->dev_ops->rx_hairpin_queue_setup == NULL) return -ENOTSUP; /* if nb_rx_desc is zero use max number of desc from the driver. */ if (nb_rx_desc == 0) @@ -2542,8 +2537,7 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id, uint16_t rx_queue_id, if (dev->data->dev_started) return -EBUSY; eth_dev_rxq_release(dev, rx_queue_id); - ret = (*dev->dev_ops->rx_hairpin_queue_setup)(dev, rx_queue_id, - nb_rx_desc, conf); + ret = dev->dev_ops->rx_hairpin_queue_setup(dev, rx_queue_id, nb_rx_desc, conf); if (ret == 0) dev->data->rx_queue_state[rx_queue_id] = RTE_ETH_QUEUE_STATE_HAIRPIN; @@ -2573,7 +2567,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } - if (*dev->dev_ops->tx_queue_setup == NULL) + if (dev->dev_ops->tx_queue_setup == NULL) return -ENOTSUP; if (tx_conf != NULL && @@ -2654,7 +2648,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, } rte_ethdev_trace_txq_setup(port_id, tx_queue_id, nb_tx_desc, tx_conf); - return eth_err(port_id, (*dev->dev_ops->tx_queue_setup)(dev, + return eth_err(port_id, dev->dev_ops->tx_queue_setup(dev, tx_queue_id, nb_tx_desc, socket_id, &local_conf)); } @@ -2687,7 +2681,7 @@ rte_eth_tx_hairpin_queue_setup(uint16_t port_id, uint16_t tx_queue_id, ret = rte_eth_dev_hairpin_capability_get(port_id, &cap); if (ret != 0) return ret; - if (*dev->dev_ops->tx_hairpin_queue_setup == NULL) + if (dev->dev_ops->tx_hairpin_queue_setup == NULL) return -ENOTSUP; /* if nb_rx_desc is zero use max number of desc from the driver. */ if (nb_tx_desc == 0) @@ -2745,8 +2739,7 @@ rte_eth_tx_hairpin_queue_setup(uint16_t port_id, uint16_t tx_queue_id, if (dev->data->dev_started) return -EBUSY; eth_dev_txq_release(dev, tx_queue_id); - ret = (*dev->dev_ops->tx_hairpin_queue_setup) - (dev, tx_queue_id, nb_tx_desc, conf); + ret = dev->dev_ops->tx_hairpin_queue_setup(dev, tx_queue_id, nb_tx_desc, conf); if (ret == 0) dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_HAIRPIN; @@ -2772,9 +2765,9 @@ rte_eth_hairpin_bind(uint16_t tx_port, uint16_t rx_port) return -EBUSY; } - if (*dev->dev_ops->hairpin_bind == NULL) + if (dev->dev_ops->hairpin_bind == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->hairpin_bind)(dev, rx_port); + ret = dev->dev_ops->hairpin_bind(dev, rx_port); if (ret != 0) RTE_ETHDEV_LOG_LINE(ERR, "Failed to bind hairpin Tx %d" " to Rx %d (%d - all ports)", @@ -2799,9 +2792,9 @@ rte_eth_hairpin_unbind(uint16_t tx_port, uint16_t rx_port) return -EBUSY; } - if (*dev->dev_ops->hairpin_unbind == NULL) + if (dev->dev_ops->hairpin_unbind == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->hairpin_unbind)(dev, rx_port); + ret = dev->dev_ops->hairpin_unbind(dev, rx_port); if (ret != 0) RTE_ETHDEV_LOG_LINE(ERR, "Failed to unbind hairpin Tx %d" " from Rx %d (%d - all ports)", @@ -2836,11 +2829,10 @@ rte_eth_hairpin_get_peer_ports(uint16_t port_id, uint16_t *peer_ports, return -EINVAL; } - if (*dev->dev_ops->hairpin_get_peer_ports == NULL) + if (dev->dev_ops->hairpin_get_peer_ports == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->hairpin_get_peer_ports)(dev, peer_ports, - len, direction); + ret = dev->dev_ops->hairpin_get_peer_ports(dev, peer_ports, len, direction); if (ret < 0) RTE_ETHDEV_LOG_LINE(ERR, "Failed to get %d hairpin peer %s ports", port_id, direction ? "Rx" : "Tx"); @@ -2926,12 +2918,11 @@ rte_eth_tx_done_cleanup(uint16_t port_id, uint16_t queue_id, uint32_t free_cnt) return ret; #endif - if (*dev->dev_ops->tx_done_cleanup == NULL) + if (dev->dev_ops->tx_done_cleanup == NULL) return -ENOTSUP; /* Call driver to free pending mbufs. */ - ret = (*dev->dev_ops->tx_done_cleanup)(dev->data->tx_queues[queue_id], - free_cnt); + ret = dev->dev_ops->tx_done_cleanup(dev->data->tx_queues[queue_id], free_cnt); ret = eth_err(port_id, ret); rte_eth_trace_tx_done_cleanup(port_id, queue_id, free_cnt, ret); @@ -2951,10 +2942,10 @@ rte_eth_promiscuous_enable(uint16_t port_id) if (dev->data->promiscuous == 1) return 0; - if (*dev->dev_ops->promiscuous_enable == NULL) + if (dev->dev_ops->promiscuous_enable == NULL) return -ENOTSUP; - diag = (*dev->dev_ops->promiscuous_enable)(dev); + diag = dev->dev_ops->promiscuous_enable(dev); dev->data->promiscuous = (diag == 0) ? 1 : 0; diag = eth_err(port_id, diag); @@ -2977,11 +2968,11 @@ rte_eth_promiscuous_disable(uint16_t port_id) if (dev->data->promiscuous == 0) return 0; - if (*dev->dev_ops->promiscuous_disable == NULL) + if (dev->dev_ops->promiscuous_disable == NULL) return -ENOTSUP; dev->data->promiscuous = 0; - diag = (*dev->dev_ops->promiscuous_disable)(dev); + diag = dev->dev_ops->promiscuous_disable(dev); if (diag != 0) dev->data->promiscuous = 1; @@ -3018,9 +3009,9 @@ rte_eth_allmulticast_enable(uint16_t port_id) if (dev->data->all_multicast == 1) return 0; - if (*dev->dev_ops->allmulticast_enable == NULL) + if (dev->dev_ops->allmulticast_enable == NULL) return -ENOTSUP; - diag = (*dev->dev_ops->allmulticast_enable)(dev); + diag = dev->dev_ops->allmulticast_enable(dev); dev->data->all_multicast = (diag == 0) ? 1 : 0; diag = eth_err(port_id, diag); @@ -3043,10 +3034,10 @@ rte_eth_allmulticast_disable(uint16_t port_id) if (dev->data->all_multicast == 0) return 0; - if (*dev->dev_ops->allmulticast_disable == NULL) + if (dev->dev_ops->allmulticast_disable == NULL) return -ENOTSUP; dev->data->all_multicast = 0; - diag = (*dev->dev_ops->allmulticast_disable)(dev); + diag = dev->dev_ops->allmulticast_disable(dev); if (diag != 0) dev->data->all_multicast = 1; @@ -3088,9 +3079,9 @@ rte_eth_link_get(uint16_t port_id, struct rte_eth_link *eth_link) if (dev->data->dev_conf.intr_conf.lsc && dev->data->dev_started) rte_eth_linkstatus_get(dev, eth_link); else { - if (*dev->dev_ops->link_update == NULL) + if (dev->dev_ops->link_update == NULL) return -ENOTSUP; - (*dev->dev_ops->link_update)(dev, 1); + dev->dev_ops->link_update(dev, 1); *eth_link = dev->data->dev_link; } @@ -3116,9 +3107,9 @@ rte_eth_link_get_nowait(uint16_t port_id, struct rte_eth_link *eth_link) if (dev->data->dev_conf.intr_conf.lsc && dev->data->dev_started) rte_eth_linkstatus_get(dev, eth_link); else { - if (*dev->dev_ops->link_update == NULL) + if (dev->dev_ops->link_update == NULL) return -ENOTSUP; - (*dev->dev_ops->link_update)(dev, 0); + dev->dev_ops->link_update(dev, 0); *eth_link = dev->data->dev_link; } @@ -3243,10 +3234,10 @@ rte_eth_stats_get(uint16_t port_id, struct rte_eth_stats *stats) memset(stats, 0, sizeof(*stats)); - if (*dev->dev_ops->stats_get == NULL) + if (dev->dev_ops->stats_get == NULL) return -ENOTSUP; stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed; - ret = eth_err(port_id, (*dev->dev_ops->stats_get)(dev, stats)); + ret = eth_err(port_id, dev->dev_ops->stats_get(dev, stats)); rte_eth_trace_stats_get(port_id, stats, ret); @@ -3262,9 +3253,9 @@ rte_eth_stats_reset(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->stats_reset == NULL) + if (dev->dev_ops->stats_reset == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->stats_reset)(dev); + ret = dev->dev_ops->stats_reset(dev); if (ret != 0) return eth_err(port_id, ret); @@ -3302,7 +3293,7 @@ eth_dev_get_xstats_count(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; if (dev->dev_ops->xstats_get_names != NULL) { - count = (*dev->dev_ops->xstats_get_names)(dev, NULL, 0); + count = dev->dev_ops->xstats_get_names(dev, NULL, 0); if (count < 0) return eth_err(port_id, count); } else @@ -3438,8 +3429,7 @@ eth_xstats_get_by_name_by_id(struct rte_eth_dev *dev, const uint64_t *ids, for (i = 0; i < k; i++) ids_copy[i] = ids[n + i] - basic_count; - rc = (*dev->dev_ops->xstats_get_names_by_id)(dev, ids_copy, - xstats_names + m, k); + rc = dev->dev_ops->xstats_get_names_by_id(dev, ids_copy, xstats_names + m, k); if (rc < 0) return rc; m += rc; @@ -3567,7 +3557,7 @@ rte_eth_xstats_get_names(uint16_t port_id, /* If there are any driver-specific xstats, append them * to end of list. */ - cnt_driver_entries = (*dev->dev_ops->xstats_get_names)( + cnt_driver_entries = dev->dev_ops->xstats_get_names( dev, xstats_names + cnt_used_entries, size - cnt_used_entries); @@ -3658,8 +3648,7 @@ eth_xtats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, for (i = 0; i < k; i++) ids_copy[i] = ids[n + i] - basic_count; - rc = (*dev->dev_ops->xstats_get_by_id)(dev, ids_copy, - values + m, k); + rc = dev->dev_ops->xstats_get_by_id(dev, ids_copy, values + m, k); if (rc < 0) return rc; m += rc; @@ -3776,7 +3765,7 @@ rte_eth_xstats_get(uint16_t port_id, struct rte_eth_xstat *xstats, /* Retrieve the xstats from the driver at the end of the * xstats struct. */ - xcount = (*dev->dev_ops->xstats_get)(dev, + xcount = dev->dev_ops->xstats_get(dev, (n > count) ? xstats + count : NULL, (n > count) ? n - count : 0); @@ -3816,7 +3805,7 @@ rte_eth_xstats_reset(uint16_t port_id) /* implemented by the driver */ if (dev->dev_ops->xstats_reset != NULL) { - int ret = eth_err(port_id, (*dev->dev_ops->xstats_reset)(dev)); + int ret = eth_err(port_id, dev->dev_ops->xstats_reset(dev)); rte_eth_trace_xstats_reset(port_id, ret); @@ -3844,12 +3833,12 @@ rte_eth_xstats_set_counter(uint16_t port_id, uint64_t id, int on_off) if (rte_eth_xstats_query_state(port_id, id) == 1) return -EEXIST; if (dev->dev_ops->xstats_enable != NULL) - return (*dev->dev_ops->xstats_enable)(dev, id - basic_count); + return dev->dev_ops->xstats_enable(dev, id - basic_count); } else { if (rte_eth_xstats_query_state(port_id, id) == 0) return 0; if (dev->dev_ops->xstats_disable != NULL) - return (*dev->dev_ops->xstats_disable)(dev, id - basic_count); + return dev->dev_ops->xstats_disable(dev, id - basic_count); } return -ENOTSUP; @@ -3871,7 +3860,7 @@ rte_eth_xstats_query_state(uint16_t port_id, uint64_t id) /* implemented by the driver */ if (dev->dev_ops->xstats_query_state != NULL) - return (*dev->dev_ops->xstats_query_state)(dev, id - basic_count); + return dev->dev_ops->xstats_query_state(dev, id - basic_count); return -ENOTSUP; } @@ -3894,9 +3883,9 @@ eth_dev_set_queue_stats_mapping(uint16_t port_id, uint16_t queue_id, if (stat_idx >= RTE_ETHDEV_QUEUE_STAT_CNTRS) return -EINVAL; - if (*dev->dev_ops->queue_stats_mapping_set == NULL) + if (dev->dev_ops->queue_stats_mapping_set == NULL) return -ENOTSUP; - return (*dev->dev_ops->queue_stats_mapping_set) (dev, queue_id, stat_idx, is_rx); + return dev->dev_ops->queue_stats_mapping_set(dev, queue_id, stat_idx, is_rx); } int @@ -3947,10 +3936,9 @@ rte_eth_dev_fw_version_get(uint16_t port_id, char *fw_version, size_t fw_size) return -EINVAL; } - if (*dev->dev_ops->fw_version_get == NULL) + if (dev->dev_ops->fw_version_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->fw_version_get)(dev, - fw_version, fw_size)); + ret = eth_err(port_id, dev->dev_ops->fw_version_get(dev, fw_version, fw_size)); rte_ethdev_trace_fw_version_get(port_id, fw_version, fw_size, ret); @@ -3995,9 +3983,9 @@ rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info) dev_info->rss_algo_capa = RTE_ETH_HASH_ALGO_CAPA_MASK(DEFAULT); dev_info->max_rx_bufsize = UINT32_MAX; - if (*dev->dev_ops->dev_infos_get == NULL) + if (dev->dev_ops->dev_infos_get == NULL) return -ENOTSUP; - diag = (*dev->dev_ops->dev_infos_get)(dev, dev_info); + diag = dev->dev_ops->dev_infos_get(dev, dev_info); if (diag != 0) { /* Cleanup already filled in device information */ memset(dev_info, 0, sizeof(struct rte_eth_dev_info)); @@ -4063,10 +4051,9 @@ rte_eth_dev_get_supported_ptypes(uint16_t port_id, uint32_t ptype_mask, return -EINVAL; } - if (*dev->dev_ops->dev_supported_ptypes_get == NULL) + if (dev->dev_ops->dev_supported_ptypes_get == NULL) return 0; - all_ptypes = (*dev->dev_ops->dev_supported_ptypes_get)(dev, - &no_of_elements); + all_ptypes = dev->dev_ops->dev_supported_ptypes_get(dev, &no_of_elements); if (!all_ptypes) return 0; @@ -4116,15 +4103,14 @@ rte_eth_dev_set_ptypes(uint16_t port_id, uint32_t ptype_mask, return -EINVAL; } - if (*dev->dev_ops->dev_supported_ptypes_get == NULL || - *dev->dev_ops->dev_ptypes_set == NULL) { + if (dev->dev_ops->dev_supported_ptypes_get == NULL || + dev->dev_ops->dev_ptypes_set == NULL) { ret = 0; goto ptype_unknown; } if (ptype_mask == 0) { - ret = (*dev->dev_ops->dev_ptypes_set)(dev, - ptype_mask); + ret = dev->dev_ops->dev_ptypes_set(dev, ptype_mask); goto ptype_unknown; } @@ -4143,8 +4129,7 @@ rte_eth_dev_set_ptypes(uint16_t port_id, uint32_t ptype_mask, goto ptype_unknown; } - all_ptypes = (*dev->dev_ops->dev_supported_ptypes_get)(dev, - &no_of_elements); + all_ptypes = dev->dev_ops->dev_supported_ptypes_get(dev, &no_of_elements); if (all_ptypes == NULL) { ret = 0; goto ptype_unknown; @@ -4173,7 +4158,7 @@ rte_eth_dev_set_ptypes(uint16_t port_id, uint32_t ptype_mask, if (set_ptypes != NULL && j < num) set_ptypes[j] = RTE_PTYPE_UNKNOWN; - return (*dev->dev_ops->dev_ptypes_set)(dev, ptype_mask); + return dev->dev_ops->dev_ptypes_set(dev, ptype_mask); ptype_unknown: if (num > 0) @@ -4261,7 +4246,7 @@ rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->mtu_set == NULL) + if (dev->dev_ops->mtu_set == NULL) return -ENOTSUP; /* @@ -4270,7 +4255,7 @@ rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu) * that are populated within the call to rte_eth_dev_info_get() * which relies on dev->dev_ops->dev_infos_get. */ - if (*dev->dev_ops->dev_infos_get != NULL) { + if (dev->dev_ops->dev_infos_get != NULL) { ret = rte_eth_dev_info_get(port_id, &dev_info); if (ret != 0) return ret; @@ -4287,7 +4272,7 @@ rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu) return -EINVAL; } - ret = (*dev->dev_ops->mtu_set)(dev, mtu); + ret = dev->dev_ops->mtu_set(dev, mtu); if (ret == 0) dev->data->mtu = mtu; @@ -4319,10 +4304,10 @@ rte_eth_dev_vlan_filter(uint16_t port_id, uint16_t vlan_id, int on) port_id, vlan_id); return -EINVAL; } - if (*dev->dev_ops->vlan_filter_set == NULL) + if (dev->dev_ops->vlan_filter_set == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->vlan_filter_set)(dev, vlan_id, on); + ret = dev->dev_ops->vlan_filter_set(dev, vlan_id, on); if (ret == 0) { struct rte_vlan_filter_conf *vfc; int vidx; @@ -4359,9 +4344,9 @@ rte_eth_dev_set_vlan_strip_on_queue(uint16_t port_id, uint16_t rx_queue_id, return -EINVAL; } - if (*dev->dev_ops->vlan_strip_queue_set == NULL) + if (dev->dev_ops->vlan_strip_queue_set == NULL) return -ENOTSUP; - (*dev->dev_ops->vlan_strip_queue_set)(dev, rx_queue_id, on); + dev->dev_ops->vlan_strip_queue_set(dev, rx_queue_id, on); rte_ethdev_trace_set_vlan_strip_on_queue(port_id, rx_queue_id, on); @@ -4379,10 +4364,9 @@ rte_eth_dev_set_vlan_ether_type(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->vlan_tpid_set == NULL) + if (dev->dev_ops->vlan_tpid_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->vlan_tpid_set)(dev, vlan_type, - tpid)); + ret = eth_err(port_id, dev->dev_ops->vlan_tpid_set(dev, vlan_type, tpid)); rte_ethdev_trace_set_vlan_ether_type(port_id, vlan_type, tpid, ret); @@ -4469,10 +4453,10 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) return -EINVAL; } - if (*dev->dev_ops->vlan_offload_set == NULL) + if (dev->dev_ops->vlan_offload_set == NULL) return -ENOTSUP; dev->data->dev_conf.rxmode.offloads = dev_offloads; - ret = (*dev->dev_ops->vlan_offload_set)(dev, mask); + ret = dev->dev_ops->vlan_offload_set(dev, mask); if (ret) { /* hit an error restore original values */ dev->data->dev_conf.rxmode.offloads = orig_offloads; @@ -4522,9 +4506,9 @@ rte_eth_dev_set_vlan_pvid(uint16_t port_id, uint16_t pvid, int on) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->vlan_pvid_set == NULL) + if (dev->dev_ops->vlan_pvid_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->vlan_pvid_set)(dev, pvid, on)); + ret = eth_err(port_id, dev->dev_ops->vlan_pvid_set(dev, pvid, on)); rte_ethdev_trace_set_vlan_pvid(port_id, pvid, on, ret); @@ -4547,10 +4531,10 @@ rte_eth_dev_flow_ctrl_get(uint16_t port_id, struct rte_eth_fc_conf *fc_conf) return -EINVAL; } - if (*dev->dev_ops->flow_ctrl_get == NULL) + if (dev->dev_ops->flow_ctrl_get == NULL) return -ENOTSUP; memset(fc_conf, 0, sizeof(*fc_conf)); - ret = eth_err(port_id, (*dev->dev_ops->flow_ctrl_get)(dev, fc_conf)); + ret = eth_err(port_id, dev->dev_ops->flow_ctrl_get(dev, fc_conf)); rte_ethdev_trace_flow_ctrl_get(port_id, fc_conf, ret); @@ -4578,9 +4562,9 @@ rte_eth_dev_flow_ctrl_set(uint16_t port_id, struct rte_eth_fc_conf *fc_conf) return -EINVAL; } - if (*dev->dev_ops->flow_ctrl_set == NULL) + if (dev->dev_ops->flow_ctrl_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->flow_ctrl_set)(dev, fc_conf)); + ret = eth_err(port_id, dev->dev_ops->flow_ctrl_set(dev, fc_conf)); rte_ethdev_trace_flow_ctrl_set(port_id, fc_conf, ret); @@ -4610,10 +4594,9 @@ rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, } /* High water, low water validation are device specific */ - if (*dev->dev_ops->priority_flow_ctrl_set == NULL) + if (dev->dev_ops->priority_flow_ctrl_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->priority_flow_ctrl_set) - (dev, pfc_conf)); + ret = eth_err(port_id, dev->dev_ops->priority_flow_ctrl_set(dev, pfc_conf)); rte_ethdev_trace_priority_flow_ctrl_set(port_id, pfc_conf, ret); @@ -4686,10 +4669,10 @@ rte_eth_dev_priority_flow_ctrl_queue_info_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->priority_flow_ctrl_queue_info_get == NULL) + if (dev->dev_ops->priority_flow_ctrl_queue_info_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->priority_flow_ctrl_queue_info_get) - (dev, pfc_queue_info)); + ret = eth_err(port_id, + dev->dev_ops->priority_flow_ctrl_queue_info_get(dev, pfc_queue_info)); rte_ethdev_trace_priority_flow_ctrl_queue_info_get(port_id, pfc_queue_info, ret); @@ -4762,10 +4745,9 @@ rte_eth_dev_priority_flow_ctrl_queue_configure(uint16_t port_id, return ret; } - if (*dev->dev_ops->priority_flow_ctrl_queue_config == NULL) + if (dev->dev_ops->priority_flow_ctrl_queue_config == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->priority_flow_ctrl_queue_config) - (dev, pfc_queue_conf)); + ret = eth_err(port_id, dev->dev_ops->priority_flow_ctrl_queue_config(dev, pfc_queue_conf)); rte_ethdev_trace_priority_flow_ctrl_queue_configure(port_id, pfc_queue_conf, ret); @@ -4859,10 +4841,9 @@ rte_eth_dev_rss_reta_update(uint16_t port_id, return -ENOTSUP; } - if (*dev->dev_ops->reta_update == NULL) + if (dev->dev_ops->reta_update == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->reta_update)(dev, reta_conf, - reta_size)); + ret = eth_err(port_id, dev->dev_ops->reta_update(dev, reta_conf, reta_size)); rte_ethdev_trace_rss_reta_update(port_id, reta_conf, reta_size, ret); @@ -4892,10 +4873,9 @@ rte_eth_dev_rss_reta_query(uint16_t port_id, if (ret < 0) return ret; - if (*dev->dev_ops->reta_query == NULL) + if (dev->dev_ops->reta_query == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->reta_query)(dev, reta_conf, - reta_size)); + ret = eth_err(port_id, dev->dev_ops->reta_query(dev, reta_conf, reta_size)); rte_ethdev_trace_rss_reta_query(port_id, reta_conf, reta_size, ret); @@ -4959,10 +4939,9 @@ rte_eth_dev_rss_hash_update(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->rss_hash_update == NULL) + if (dev->dev_ops->rss_hash_update == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rss_hash_update)(dev, - rss_conf)); + ret = eth_err(port_id, dev->dev_ops->rss_hash_update(dev, rss_conf)); rte_ethdev_trace_rss_hash_update(port_id, rss_conf, ret); @@ -5001,10 +4980,9 @@ rte_eth_dev_rss_hash_conf_get(uint16_t port_id, rss_conf->algorithm = RTE_ETH_HASH_FUNCTION_DEFAULT; - if (*dev->dev_ops->rss_hash_conf_get == NULL) + if (dev->dev_ops->rss_hash_conf_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rss_hash_conf_get)(dev, - rss_conf)); + ret = eth_err(port_id, dev->dev_ops->rss_hash_conf_get(dev, rss_conf)); rte_ethdev_trace_rss_hash_conf_get(port_id, rss_conf, ret); @@ -5062,10 +5040,9 @@ rte_eth_dev_udp_tunnel_port_add(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->udp_tunnel_port_add == NULL) + if (dev->dev_ops->udp_tunnel_port_add == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->udp_tunnel_port_add)(dev, - udp_tunnel)); + ret = eth_err(port_id, dev->dev_ops->udp_tunnel_port_add(dev, udp_tunnel)); rte_ethdev_trace_udp_tunnel_port_add(port_id, udp_tunnel, ret); @@ -5094,10 +5071,9 @@ rte_eth_dev_udp_tunnel_port_delete(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->udp_tunnel_port_del == NULL) + if (dev->dev_ops->udp_tunnel_port_del == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->udp_tunnel_port_del)(dev, - udp_tunnel)); + ret = eth_err(port_id, dev->dev_ops->udp_tunnel_port_del(dev, udp_tunnel)); rte_ethdev_trace_udp_tunnel_port_delete(port_id, udp_tunnel, ret); @@ -5113,9 +5089,9 @@ rte_eth_led_on(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_led_on == NULL) + if (dev->dev_ops->dev_led_on == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_led_on)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_led_on(dev)); rte_eth_trace_led_on(port_id, ret); @@ -5131,9 +5107,9 @@ rte_eth_led_off(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->dev_led_off == NULL) + if (dev->dev_ops->dev_led_off == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->dev_led_off)(dev)); + ret = eth_err(port_id, dev->dev_ops->dev_led_off(dev)); rte_eth_trace_led_off(port_id, ret); @@ -5158,9 +5134,9 @@ rte_eth_fec_get_capability(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->fec_get_capability == NULL) + if (dev->dev_ops->fec_get_capability == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->fec_get_capability)(dev, speed_fec_capa, num); + ret = dev->dev_ops->fec_get_capability(dev, speed_fec_capa, num); rte_eth_trace_fec_get_capability(port_id, speed_fec_capa, num, ret); @@ -5183,9 +5159,9 @@ rte_eth_fec_get(uint16_t port_id, uint32_t *fec_capa) return -EINVAL; } - if (*dev->dev_ops->fec_get == NULL) + if (dev->dev_ops->fec_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->fec_get)(dev, fec_capa)); + ret = eth_err(port_id, dev->dev_ops->fec_get(dev, fec_capa)); rte_eth_trace_fec_get(port_id, fec_capa, ret); @@ -5206,9 +5182,9 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa) return -EINVAL; } - if (*dev->dev_ops->fec_set == NULL) + if (dev->dev_ops->fec_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa)); + ret = eth_err(port_id, dev->dev_ops->fec_set(dev, fec_capa)); rte_eth_trace_fec_set(port_id, fec_capa, ret); @@ -5260,7 +5236,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, return -EINVAL; } - if (*dev->dev_ops->mac_addr_add == NULL) + if (dev->dev_ops->mac_addr_add == NULL) return -ENOTSUP; if (rte_is_zero_ether_addr(addr)) { @@ -5290,7 +5266,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct rte_ether_addr *addr, } /* Update NIC */ - ret = (*dev->dev_ops->mac_addr_add)(dev, addr, index, pool); + ret = dev->dev_ops->mac_addr_add(dev, addr, index, pool); if (ret == 0) { /* Update address in NIC data structure */ @@ -5323,7 +5299,7 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct rte_ether_addr *addr) return -EINVAL; } - if (*dev->dev_ops->mac_addr_remove == NULL) + if (dev->dev_ops->mac_addr_remove == NULL) return -ENOTSUP; index = eth_dev_get_mac_addr_index(port_id, addr); @@ -5336,7 +5312,7 @@ rte_eth_dev_mac_addr_remove(uint16_t port_id, struct rte_ether_addr *addr) return 0; /* Do nothing if address wasn't found */ /* Update NIC */ - (*dev->dev_ops->mac_addr_remove)(dev, index); + dev->dev_ops->mac_addr_remove(dev, index); /* Update address in NIC data structure */ rte_ether_addr_copy(&null_mac_addr, &dev->data->mac_addrs[index]); @@ -5369,7 +5345,7 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr) if (!rte_is_valid_assigned_ether_addr(addr)) return -EINVAL; - if (*dev->dev_ops->mac_addr_set == NULL) + if (dev->dev_ops->mac_addr_set == NULL) return -ENOTSUP; /* Keep address unique in dev->data->mac_addrs[]. */ @@ -5381,7 +5357,7 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr *addr) return -EEXIST; } - ret = (*dev->dev_ops->mac_addr_set)(dev, addr); + ret = dev->dev_ops->mac_addr_set(dev, addr); if (ret < 0) return ret; @@ -5467,9 +5443,9 @@ rte_eth_dev_uc_hash_table_set(uint16_t port_id, struct rte_ether_addr *addr, } } - if (*dev->dev_ops->uc_hash_table_set == NULL) + if (dev->dev_ops->uc_hash_table_set == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->uc_hash_table_set)(dev, addr, on); + ret = dev->dev_ops->uc_hash_table_set(dev, addr, on); if (ret == 0) { /* Update address in NIC data structure */ if (on) @@ -5496,9 +5472,9 @@ rte_eth_dev_uc_all_hash_table_set(uint16_t port_id, uint8_t on) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->uc_all_hash_table_set == NULL) + if (dev->dev_ops->uc_all_hash_table_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->uc_all_hash_table_set)(dev, on)); + ret = eth_err(port_id, dev->dev_ops->uc_all_hash_table_set(dev, on)); rte_ethdev_trace_uc_all_hash_table_set(port_id, on, ret); @@ -5536,10 +5512,9 @@ int rte_eth_set_queue_rate_limit(uint16_t port_id, uint16_t queue_idx, return -EINVAL; } - if (*dev->dev_ops->set_queue_rate_limit == NULL) + if (dev->dev_ops->set_queue_rate_limit == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->set_queue_rate_limit)(dev, - queue_idx, tx_rate)); + ret = eth_err(port_id, dev->dev_ops->set_queue_rate_limit(dev, queue_idx, tx_rate)); rte_eth_trace_set_queue_rate_limit(port_id, queue_idx, tx_rate, ret); @@ -5568,10 +5543,10 @@ int rte_eth_rx_avail_thresh_set(uint16_t port_id, uint16_t queue_id, port_id); return -EINVAL; } - if (*dev->dev_ops->rx_queue_avail_thresh_set == NULL) + if (dev->dev_ops->rx_queue_avail_thresh_set == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_avail_thresh_set)(dev, - queue_id, avail_thresh)); + ret = eth_err(port_id, + dev->dev_ops->rx_queue_avail_thresh_set(dev, queue_id, avail_thresh)); rte_eth_trace_rx_avail_thresh_set(port_id, queue_id, avail_thresh, ret); @@ -5592,10 +5567,10 @@ int rte_eth_rx_avail_thresh_query(uint16_t port_id, uint16_t *queue_id, if (*queue_id >= dev->data->nb_rx_queues) *queue_id = 0; - if (*dev->dev_ops->rx_queue_avail_thresh_query == NULL) + if (dev->dev_ops->rx_queue_avail_thresh_query == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_avail_thresh_query)(dev, - queue_id, avail_thresh)); + ret = eth_err(port_id, + dev->dev_ops->rx_queue_avail_thresh_query(dev, queue_id, avail_thresh)); rte_eth_trace_rx_avail_thresh_query(port_id, *queue_id, ret); @@ -5886,9 +5861,9 @@ rte_eth_dev_rx_intr_enable(uint16_t port_id, if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_intr_enable == NULL) + if (dev->dev_ops->rx_queue_intr_enable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_intr_enable)(dev, queue_id)); + ret = eth_err(port_id, dev->dev_ops->rx_queue_intr_enable(dev, queue_id)); rte_ethdev_trace_rx_intr_enable(port_id, queue_id, ret); @@ -5909,9 +5884,9 @@ rte_eth_dev_rx_intr_disable(uint16_t port_id, if (ret != 0) return ret; - if (*dev->dev_ops->rx_queue_intr_disable == NULL) + if (dev->dev_ops->rx_queue_intr_disable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->rx_queue_intr_disable)(dev, queue_id)); + ret = eth_err(port_id, dev->dev_ops->rx_queue_intr_disable(dev, queue_id)); rte_ethdev_trace_rx_intr_disable(port_id, queue_id, ret); @@ -6189,7 +6164,7 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->rxq_info_get == NULL) + if (dev->dev_ops->rxq_info_get == NULL) return -ENOTSUP; memset(qinfo, 0, sizeof(*qinfo)); @@ -6237,7 +6212,7 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->txq_info_get == NULL) + if (dev->dev_ops->txq_info_get == NULL) return -ENOTSUP; memset(qinfo, 0, sizeof(*qinfo)); @@ -6263,7 +6238,7 @@ rte_eth_recycle_rx_queue_info_get(uint16_t port_id, uint16_t queue_id, if (unlikely(ret != 0)) return ret; - if (*dev->dev_ops->recycle_rxq_info_get == NULL) + if (dev->dev_ops->recycle_rxq_info_get == NULL) return -ENOTSUP; dev->dev_ops->recycle_rxq_info_get(dev, queue_id, recycle_rxq_info); @@ -6293,7 +6268,7 @@ rte_eth_rx_burst_mode_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->rx_burst_mode_get == NULL) + if (dev->dev_ops->rx_burst_mode_get == NULL) return -ENOTSUP; memset(mode, 0, sizeof(*mode)); ret = eth_err(port_id, @@ -6326,7 +6301,7 @@ rte_eth_tx_burst_mode_get(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->tx_burst_mode_get == NULL) + if (dev->dev_ops->tx_burst_mode_get == NULL) return -ENOTSUP; memset(mode, 0, sizeof(*mode)); ret = eth_err(port_id, @@ -6359,7 +6334,7 @@ rte_eth_get_monitor_addr(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->get_monitor_addr == NULL) + if (dev->dev_ops->get_monitor_addr == NULL) return -ENOTSUP; ret = eth_err(port_id, dev->dev_ops->get_monitor_addr(dev->data->rx_queues[queue_id], pmc)); @@ -6380,7 +6355,7 @@ rte_eth_dev_set_mc_addr_list(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->set_mc_addr_list == NULL) + if (dev->dev_ops->set_mc_addr_list == NULL) return -ENOTSUP; ret = eth_err(port_id, dev->dev_ops->set_mc_addr_list(dev, mc_addr_set, nb_mc_addr)); @@ -6400,9 +6375,9 @@ rte_eth_timesync_enable(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_enable == NULL) + if (dev->dev_ops->timesync_enable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_enable)(dev)); + ret = eth_err(port_id, dev->dev_ops->timesync_enable(dev)); rte_eth_trace_timesync_enable(port_id, ret); @@ -6418,9 +6393,9 @@ rte_eth_timesync_disable(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_disable == NULL) + if (dev->dev_ops->timesync_disable == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_disable)(dev)); + ret = eth_err(port_id, dev->dev_ops->timesync_disable(dev)); rte_eth_trace_timesync_disable(port_id, ret); @@ -6444,11 +6419,10 @@ rte_eth_timesync_read_rx_timestamp(uint16_t port_id, struct timespec *timestamp, return -EINVAL; } - if (*dev->dev_ops->timesync_read_rx_timestamp == NULL) + if (dev->dev_ops->timesync_read_rx_timestamp == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_read_rx_timestamp) - (dev, timestamp, flags)); + ret = eth_err(port_id, dev->dev_ops->timesync_read_rx_timestamp(dev, timestamp, flags)); rte_eth_trace_timesync_read_rx_timestamp(port_id, timestamp, flags, ret); @@ -6473,11 +6447,10 @@ rte_eth_timesync_read_tx_timestamp(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->timesync_read_tx_timestamp == NULL) + if (dev->dev_ops->timesync_read_tx_timestamp == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_read_tx_timestamp) - (dev, timestamp)); + ret = eth_err(port_id, dev->dev_ops->timesync_read_tx_timestamp(dev, timestamp)); rte_eth_trace_timesync_read_tx_timestamp(port_id, timestamp, ret); @@ -6494,9 +6467,9 @@ rte_eth_timesync_adjust_time(uint16_t port_id, int64_t delta) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_adjust_time == NULL) + if (dev->dev_ops->timesync_adjust_time == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_adjust_time)(dev, delta)); + ret = eth_err(port_id, dev->dev_ops->timesync_adjust_time(dev, delta)); rte_eth_trace_timesync_adjust_time(port_id, delta, ret); @@ -6512,9 +6485,9 @@ rte_eth_timesync_adjust_freq(uint16_t port_id, int64_t ppm) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->timesync_adjust_freq == NULL) + if (dev->dev_ops->timesync_adjust_freq == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_adjust_freq)(dev, ppm)); + ret = eth_err(port_id, dev->dev_ops->timesync_adjust_freq(dev, ppm)); rte_eth_trace_timesync_adjust_freq(port_id, ppm, ret); @@ -6537,10 +6510,9 @@ rte_eth_timesync_read_time(uint16_t port_id, struct timespec *timestamp) return -EINVAL; } - if (*dev->dev_ops->timesync_read_time == NULL) + if (dev->dev_ops->timesync_read_time == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_read_time)(dev, - timestamp)); + ret = eth_err(port_id, dev->dev_ops->timesync_read_time(dev, timestamp)); rte_eth_trace_timesync_read_time(port_id, timestamp, ret); @@ -6563,10 +6535,9 @@ rte_eth_timesync_write_time(uint16_t port_id, const struct timespec *timestamp) return -EINVAL; } - if (*dev->dev_ops->timesync_write_time == NULL) + if (dev->dev_ops->timesync_write_time == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->timesync_write_time)(dev, - timestamp)); + ret = eth_err(port_id, dev->dev_ops->timesync_write_time(dev, timestamp)); rte_eth_trace_timesync_write_time(port_id, timestamp, ret); @@ -6588,9 +6559,9 @@ rte_eth_read_clock(uint16_t port_id, uint64_t *clock) return -EINVAL; } - if (*dev->dev_ops->read_clock == NULL) + if (dev->dev_ops->read_clock == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->read_clock)(dev, clock)); + ret = eth_err(port_id, dev->dev_ops->read_clock(dev, clock)); rte_eth_trace_read_clock(port_id, clock, ret); @@ -6645,9 +6616,9 @@ rte_eth_dev_get_reg_info_ext(uint16_t port_id, struct rte_dev_reg_info *info) if (info->names != NULL && info->length != 0) memset(info->names, 0, sizeof(struct rte_eth_reg_name) * info->length); - if (*dev->dev_ops->get_reg == NULL) + if (dev->dev_ops->get_reg == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_reg)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->get_reg(dev, info)); rte_ethdev_trace_get_reg_info(port_id, info, ret); @@ -6669,9 +6640,9 @@ rte_eth_dev_get_eeprom_length(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->get_eeprom_length == NULL) + if (dev->dev_ops->get_eeprom_length == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_eeprom_length)(dev)); + ret = eth_err(port_id, dev->dev_ops->get_eeprom_length(dev)); rte_ethdev_trace_get_eeprom_length(port_id, ret); @@ -6694,9 +6665,9 @@ rte_eth_dev_get_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info) return -EINVAL; } - if (*dev->dev_ops->get_eeprom == NULL) + if (dev->dev_ops->get_eeprom == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_eeprom)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->get_eeprom(dev, info)); rte_ethdev_trace_get_eeprom(port_id, info, ret); @@ -6719,9 +6690,9 @@ rte_eth_dev_set_eeprom(uint16_t port_id, struct rte_dev_eeprom_info *info) return -EINVAL; } - if (*dev->dev_ops->set_eeprom == NULL) + if (dev->dev_ops->set_eeprom == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->set_eeprom)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->set_eeprom(dev, info)); rte_ethdev_trace_set_eeprom(port_id, info, ret); @@ -6745,9 +6716,9 @@ rte_eth_dev_get_module_info(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->get_module_info == NULL) + if (dev->dev_ops->get_module_info == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->get_module_info)(dev, modinfo); + ret = dev->dev_ops->get_module_info(dev, modinfo); rte_ethdev_trace_get_module_info(port_id, modinfo, ret); @@ -6785,9 +6756,9 @@ rte_eth_dev_get_module_eeprom(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->get_module_eeprom == NULL) + if (dev->dev_ops->get_module_eeprom == NULL) return -ENOTSUP; - ret = (*dev->dev_ops->get_module_eeprom)(dev, info); + ret = dev->dev_ops->get_module_eeprom(dev, info); rte_ethdev_trace_get_module_eeprom(port_id, info, ret); @@ -6813,9 +6784,9 @@ rte_eth_dev_get_dcb_info(uint16_t port_id, memset(dcb_info, 0, sizeof(struct rte_eth_dcb_info)); - if (*dev->dev_ops->get_dcb_info == NULL) + if (dev->dev_ops->get_dcb_info == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->get_dcb_info)(dev, dcb_info)); + ret = eth_err(port_id, dev->dev_ops->get_dcb_info(dev, dcb_info)); rte_ethdev_trace_get_dcb_info(port_id, dcb_info, ret); @@ -6883,10 +6854,10 @@ rte_eth_dev_hairpin_capability_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->hairpin_cap_get == NULL) + if (dev->dev_ops->hairpin_cap_get == NULL) return -ENOTSUP; memset(cap, 0, sizeof(*cap)); - ret = eth_err(port_id, (*dev->dev_ops->hairpin_cap_get)(dev, cap)); + ret = eth_err(port_id, dev->dev_ops->hairpin_cap_get(dev, cap)); rte_ethdev_trace_hairpin_capability_get(port_id, cap, ret); @@ -6909,10 +6880,10 @@ rte_eth_dev_pool_ops_supported(uint16_t port_id, const char *pool) return -EINVAL; } - if (*dev->dev_ops->pool_ops_supported == NULL) + if (dev->dev_ops->pool_ops_supported == NULL) return 1; /* all pools are supported */ - ret = (*dev->dev_ops->pool_ops_supported)(dev, pool); + ret = dev->dev_ops->pool_ops_supported(dev, pool); rte_ethdev_trace_pool_ops_supported(port_id, pool, ret); @@ -6929,9 +6900,9 @@ rte_eth_representor_info_get(uint16_t port_id, RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->representor_info_get == NULL) + if (dev->dev_ops->representor_info_get == NULL) return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->representor_info_get)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->representor_info_get(dev, info)); rte_eth_trace_representor_info_get(port_id, info, ret); @@ -6963,10 +6934,10 @@ rte_eth_rx_metadata_negotiate(uint16_t port_id, uint64_t *features) rte_flow_restore_info_dynflag_register() < 0) *features &= ~RTE_ETH_RX_METADATA_TUNNEL_ID; - if (*dev->dev_ops->rx_metadata_negotiate == NULL) + if (dev->dev_ops->rx_metadata_negotiate == NULL) return -ENOTSUP; ret = eth_err(port_id, - (*dev->dev_ops->rx_metadata_negotiate)(dev, features)); + dev->dev_ops->rx_metadata_negotiate(dev, features)); rte_eth_trace_rx_metadata_negotiate(port_id, *features, ret); @@ -6995,12 +6966,12 @@ rte_eth_ip_reassembly_capability_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->ip_reassembly_capability_get == NULL) + if (dev->dev_ops->ip_reassembly_capability_get == NULL) return -ENOTSUP; memset(reassembly_capa, 0, sizeof(struct rte_eth_ip_reassembly_params)); - ret = eth_err(port_id, (*dev->dev_ops->ip_reassembly_capability_get) - (dev, reassembly_capa)); + ret = eth_err(port_id, + dev->dev_ops->ip_reassembly_capability_get(dev, reassembly_capa)); rte_eth_trace_ip_reassembly_capability_get(port_id, reassembly_capa, ret); @@ -7030,11 +7001,11 @@ rte_eth_ip_reassembly_conf_get(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->ip_reassembly_conf_get == NULL) + if (dev->dev_ops->ip_reassembly_conf_get == NULL) return -ENOTSUP; memset(conf, 0, sizeof(struct rte_eth_ip_reassembly_params)); ret = eth_err(port_id, - (*dev->dev_ops->ip_reassembly_conf_get)(dev, conf)); + dev->dev_ops->ip_reassembly_conf_get(dev, conf)); rte_eth_trace_ip_reassembly_conf_get(port_id, conf, ret); @@ -7071,10 +7042,10 @@ rte_eth_ip_reassembly_conf_set(uint16_t port_id, return -EINVAL; } - if (*dev->dev_ops->ip_reassembly_conf_set == NULL) + if (dev->dev_ops->ip_reassembly_conf_set == NULL) return -ENOTSUP; ret = eth_err(port_id, - (*dev->dev_ops->ip_reassembly_conf_set)(dev, conf)); + dev->dev_ops->ip_reassembly_conf_set(dev, conf)); rte_eth_trace_ip_reassembly_conf_set(port_id, conf, ret); @@ -7094,9 +7065,9 @@ rte_eth_dev_priv_dump(uint16_t port_id, FILE *file) return -EINVAL; } - if (*dev->dev_ops->eth_dev_priv_dump == NULL) + if (dev->dev_ops->eth_dev_priv_dump == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->eth_dev_priv_dump)(dev, file)); + return eth_err(port_id, dev->dev_ops->eth_dev_priv_dump(dev, file)); } int @@ -7118,11 +7089,11 @@ rte_eth_rx_descriptor_dump(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->eth_rx_descriptor_dump == NULL) + if (dev->dev_ops->eth_rx_descriptor_dump == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->eth_rx_descriptor_dump)(dev, - queue_id, offset, num, file)); + return eth_err(port_id, + dev->dev_ops->eth_rx_descriptor_dump(dev, queue_id, offset, num, file)); } int @@ -7144,11 +7115,11 @@ rte_eth_tx_descriptor_dump(uint16_t port_id, uint16_t queue_id, return -EINVAL; } - if (*dev->dev_ops->eth_tx_descriptor_dump == NULL) + if (dev->dev_ops->eth_tx_descriptor_dump == NULL) return -ENOTSUP; - return eth_err(port_id, (*dev->dev_ops->eth_tx_descriptor_dump)(dev, - queue_id, offset, num, file)); + return eth_err(port_id, + dev->dev_ops->eth_tx_descriptor_dump(dev, queue_id, offset, num, file)); } int @@ -7170,10 +7141,9 @@ rte_eth_buffer_split_get_supported_hdr_ptypes(uint16_t port_id, uint32_t *ptypes return -EINVAL; } - if (*dev->dev_ops->buffer_split_supported_hdr_ptypes_get == NULL) + if (dev->dev_ops->buffer_split_supported_hdr_ptypes_get == NULL) return -ENOTSUP; - all_types = (*dev->dev_ops->buffer_split_supported_hdr_ptypes_get)(dev, - &no_of_elements); + all_types = dev->dev_ops->buffer_split_supported_hdr_ptypes_get(dev, &no_of_elements); if (all_types == NULL) return 0; @@ -7199,9 +7169,9 @@ int rte_eth_dev_count_aggr_ports(uint16_t port_id) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; - if (*dev->dev_ops->count_aggr_ports == NULL) + if (dev->dev_ops->count_aggr_ports == NULL) return 0; - ret = eth_err(port_id, (*dev->dev_ops->count_aggr_ports)(dev)); + ret = eth_err(port_id, dev->dev_ops->count_aggr_ports(dev)); rte_eth_trace_count_aggr_ports(port_id, ret); @@ -7223,7 +7193,7 @@ int rte_eth_dev_map_aggr_tx_affinity(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } - if (*dev->dev_ops->map_aggr_tx_affinity == NULL) + if (dev->dev_ops->map_aggr_tx_affinity == NULL) return -ENOTSUP; if (dev->data->dev_configured == 0) { @@ -7255,8 +7225,8 @@ int rte_eth_dev_map_aggr_tx_affinity(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } - ret = eth_err(port_id, (*dev->dev_ops->map_aggr_tx_affinity)(dev, - tx_queue_id, affinity)); + ret = eth_err(port_id, + dev->dev_ops->map_aggr_tx_affinity(dev, tx_queue_id, affinity)); rte_eth_trace_map_aggr_tx_affinity(port_id, tx_queue_id, affinity, ret); diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 6a51bfba5f..ea7f8c4a1a 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -6399,9 +6399,9 @@ rte_eth_rx_queue_count(uint16_t port_id, uint16_t queue_id) return -EINVAL; #endif - if (*p->rx_queue_count == NULL) + if (p->rx_queue_count == NULL) return -ENOTSUP; - return (int)(*p->rx_queue_count)(qd); + return (int)p->rx_queue_count(qd); } /**@{@name Rx hardware descriptor states @@ -6471,9 +6471,9 @@ rte_eth_rx_descriptor_status(uint16_t port_id, uint16_t queue_id, if (qd == NULL) return -ENODEV; #endif - if (*p->rx_descriptor_status == NULL) + if (p->rx_descriptor_status == NULL) return -ENOTSUP; - return (*p->rx_descriptor_status)(qd, offset); + return p->rx_descriptor_status(qd, offset); } /**@{@name Tx hardware descriptor states @@ -6542,9 +6542,9 @@ static inline int rte_eth_tx_descriptor_status(uint16_t port_id, if (qd == NULL) return -ENODEV; #endif - if (*p->tx_descriptor_status == NULL) + if (p->tx_descriptor_status == NULL) return -ENOTSUP; - return (*p->tx_descriptor_status)(qd, offset); + return p->tx_descriptor_status(qd, offset); } /** diff --git a/lib/ethdev/rte_ethdev_cman.c b/lib/ethdev/rte_ethdev_cman.c index 41e38bdc89..73262ffc5f 100644 --- a/lib/ethdev/rte_ethdev_cman.c +++ b/lib/ethdev/rte_ethdev_cman.c @@ -31,7 +31,7 @@ rte_eth_cman_info_get(uint16_t port_id, struct rte_eth_cman_info *info) } memset(info, 0, sizeof(struct rte_eth_cman_info)); - ret = eth_err(port_id, (*dev->dev_ops->cman_info_get)(dev, info)); + ret = eth_err(port_id, dev->dev_ops->cman_info_get(dev, info)); rte_eth_trace_cman_info_get(port_id, info, ret); @@ -59,7 +59,7 @@ rte_eth_cman_config_init(uint16_t port_id, struct rte_eth_cman_config *config) } memset(config, 0, sizeof(struct rte_eth_cman_config)); - ret = eth_err(port_id, (*dev->dev_ops->cman_config_init)(dev, config)); + ret = eth_err(port_id, dev->dev_ops->cman_config_init(dev, config)); rte_eth_trace_cman_config_init(port_id, config, ret); @@ -86,7 +86,7 @@ rte_eth_cman_config_set(uint16_t port_id, const struct rte_eth_cman_config *conf return -ENOTSUP; } - ret = eth_err(port_id, (*dev->dev_ops->cman_config_set)(dev, config)); + ret = eth_err(port_id, dev->dev_ops->cman_config_set(dev, config)); rte_eth_trace_cman_config_set(port_id, config, ret); @@ -114,7 +114,7 @@ rte_eth_cman_config_get(uint16_t port_id, struct rte_eth_cman_config *config) } memset(config, 0, sizeof(struct rte_eth_cman_config)); - ret = eth_err(port_id, (*dev->dev_ops->cman_config_get)(dev, config)); + ret = eth_err(port_id, dev->dev_ops->cman_config_get(dev, config)); rte_eth_trace_cman_config_get(port_id, config, ret); -- 2.47.2