From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by dpdk.org (Postfix) with ESMTP id BEA85A6A for ; Thu, 5 Mar 2015 19:41:26 +0100 (CET) Received: by wevm14 with SMTP id m14so54798382wev.8 for ; Thu, 05 Mar 2015 10:41:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=GkYrejXL+U+NsacqOBOZvp+2V+BIbj8+JKN3pgneJI4=; b=kqiiUmz2qQaWD6Cmdes+aoA2YkXxaJ2vpTDnUj42StfzQd/BZldEDGzNv6+wnNuG4O prhKC3z1E52k01sExqj+P8dLDi2nGFjkRl5fx7piZ8z1dNYAI1rWHIvspq3v0V6zK2OX ECf9mczUTYeUJ3BI+QFaD9I3Db6KvGBojY5JhQCAieFB5w6+Goo6oP4BIzq50J3Rwhkt aKhumvcsmISeBT9WDEegnM1OpGfJi3R6b8Z3ghZ+nmft/3Fc72yyOk5LnYf64K0X5CmA pvsiB/+MnlB0hYkAQfp3ri6ilOYoImNA9I2zZBDfynRtNlndrh+GQ06vwM3kbuYtH8e4 Vx0g== X-Gm-Message-State: ALoCoQkAr3cqBgR4TrDZqsDVLR5ywvi8l1fie+KbltkDVSXBfQZQAM/DJdYxUnwSCiHMyZcZr3bv X-Received: by 10.180.206.98 with SMTP id ln2mr67839607wic.94.1425580885503; Thu, 05 Mar 2015 10:41:25 -0800 (PST) Received: from localhost.localdomain (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by mx.google.com with ESMTPSA id dq1sm9570325wib.20.2015.03.05.10.41.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Mar 2015 10:41:24 -0800 (PST) From: Thomas Monjalon To: dev@dpdk.org Date: Thu, 5 Mar 2015 19:40:45 +0100 Message-Id: <1425580845-13462-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.2.2 Subject: [dpdk-dev] [PATCH] ethdev: remove useless parameter in init functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2015 18:41:27 -0000 The pointer to struct eth_driver is not used and is already set in struct rte_eth_dev. It's a small cleanup in PMD API which probably needs more attention to make clear what is a driver, a PCI driver, an ethernet driver, etc. Signed-off-by: Thomas Monjalon --- lib/librte_ether/rte_ethdev.c | 4 ++-- lib/librte_ether/rte_ethdev.h | 14 ++++---------- lib/librte_pmd_e1000/em_ethdev.c | 3 +-- lib/librte_pmd_e1000/igb_ethdev.c | 6 ++---- lib/librte_pmd_enic/enic_ethdev.c | 4 +--- lib/librte_pmd_fm10k/fm10k_ethdev.c | 3 +-- lib/librte_pmd_i40e/i40e_ethdev.c | 7 ++----- lib/librte_pmd_i40e/i40e_ethdev_vf.c | 3 +-- lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 12 ++++-------- lib/librte_pmd_virtio/virtio_ethdev.c | 6 ++---- lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c | 6 ++---- 11 files changed, 22 insertions(+), 46 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 6ea7a17..c5e1dec 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -324,7 +324,7 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv, eth_dev->data->mtu = ETHER_MTU; /* Invoke PMD device initialization function */ - diag = (*eth_drv->eth_dev_init)(eth_drv, eth_dev); + diag = (*eth_drv->eth_dev_init)(eth_dev); if (diag == 0) return (0); @@ -362,7 +362,7 @@ rte_eth_dev_uninit(struct rte_pci_device *pci_dev) /* Invoke PMD device uninit function */ if (*eth_drv->eth_dev_uninit) { - ret = (*eth_drv->eth_dev_uninit)(eth_drv, eth_dev); + ret = (*eth_drv->eth_dev_uninit)(eth_dev); if (ret) return ret; } diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 8db3127..21aa359 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1609,9 +1609,6 @@ struct eth_driver; * Initialization function of an Ethernet driver invoked for each matching * Ethernet PCI device detected during the PCI probing phase. * - * @param eth_drv - * The pointer to the [matching] Ethernet driver structure supplied by - * the PMD when it registered itself. * @param eth_dev * The *eth_dev* pointer is the address of the *rte_eth_dev* structure * associated with the matching device and which have been [automatically] @@ -1622,6 +1619,8 @@ struct eth_driver; * - *pci_dev*: Holds the pointers to the *rte_pci_device* structure which * contains the generic PCI information of the matching device. * + * - *driver*: Holds the pointer to the *eth_driver* structure. + * * - *dev_private*: Holds a pointer to the device private data structure. * * - *mtu*: Contains the default Ethernet maximum frame length (1500). @@ -1635,17 +1634,13 @@ struct eth_driver; * of the *eth_dev* structure. * - <0: Error code of the device initialization failure. */ -typedef int (*eth_dev_init_t)(struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev); +typedef int (*eth_dev_init_t)(struct rte_eth_dev *eth_dev); /** * @internal * Finalization function of an Ethernet driver invoked for each matching * Ethernet PCI device detected during the PCI closing phase. * - * @param eth_drv - * The pointer to the [matching] Ethernet driver structure supplied by - * the PMD when it registered itself. * @param eth_dev * The *eth_dev* pointer is the address of the *rte_eth_dev* structure * associated with the matching device and which have been [automatically] @@ -1656,8 +1651,7 @@ typedef int (*eth_dev_init_t)(struct eth_driver *eth_drv, * of the *eth_dev* structure. * - <0: Error code of the device initialization failure. */ -typedef int (*eth_dev_uninit_t)(const struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev); +typedef int (*eth_dev_uninit_t)(struct rte_eth_dev *eth_dev); /** * @internal diff --git a/lib/librte_pmd_e1000/em_ethdev.c b/lib/librte_pmd_e1000/em_ethdev.c index 3f2897e..332c2e9 100644 --- a/lib/librte_pmd_e1000/em_ethdev.c +++ b/lib/librte_pmd_e1000/em_ethdev.c @@ -217,8 +217,7 @@ rte_em_dev_atomic_write_link_status(struct rte_eth_dev *dev, } static int -eth_em_dev_init(__attribute__((unused)) struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev) +eth_em_dev_init(struct rte_eth_dev *eth_dev) { struct rte_pci_device *pci_dev; struct e1000_hw *hw = diff --git a/lib/librte_pmd_e1000/igb_ethdev.c b/lib/librte_pmd_e1000/igb_ethdev.c index 504ae74..4aaa6ec 100644 --- a/lib/librte_pmd_e1000/igb_ethdev.c +++ b/lib/librte_pmd_e1000/igb_ethdev.c @@ -453,8 +453,7 @@ igb_reset_swfw_lock(struct e1000_hw *hw) } static int -eth_igb_dev_init(__attribute__((unused)) struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev) +eth_igb_dev_init(struct rte_eth_dev *eth_dev) { int error = 0; struct rte_pci_device *pci_dev; @@ -614,8 +613,7 @@ err_late: * Virtual Function device init */ static int -eth_igbvf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev) +eth_igbvf_dev_init(struct rte_eth_dev *eth_dev) { struct rte_pci_device *pci_dev; struct e1000_hw *hw = diff --git a/lib/librte_pmd_enic/enic_ethdev.c b/lib/librte_pmd_enic/enic_ethdev.c index 9cb6666..4950ede 100644 --- a/lib/librte_pmd_enic/enic_ethdev.c +++ b/lib/librte_pmd_enic/enic_ethdev.c @@ -555,9 +555,7 @@ struct enic *enicpmd_list_head = NULL; /* Initialize the driver * It returns 0 on success. */ -static int eth_enicpmd_dev_init( - __attribute__((unused))struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev) +static int eth_enicpmd_dev_init(struct rte_eth_dev *eth_dev) { struct rte_pci_device *pdev; struct rte_pci_addr *addr; diff --git a/lib/librte_pmd_fm10k/fm10k_ethdev.c b/lib/librte_pmd_fm10k/fm10k_ethdev.c index 07ea1e7..62c4a39 100644 --- a/lib/librte_pmd_fm10k/fm10k_ethdev.c +++ b/lib/librte_pmd_fm10k/fm10k_ethdev.c @@ -1668,8 +1668,7 @@ static struct eth_dev_ops fm10k_eth_dev_ops = { }; static int -eth_fm10k_dev_init(__rte_unused struct eth_driver *eth_drv, - struct rte_eth_dev *dev) +eth_fm10k_dev_init(struct rte_eth_dev *dev) { struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private); int diag; diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c b/lib/librte_pmd_i40e/i40e_ethdev.c index 5e502b6..6888072 100644 --- a/lib/librte_pmd_i40e/i40e_ethdev.c +++ b/lib/librte_pmd_i40e/i40e_ethdev.c @@ -106,9 +106,7 @@ (1UL << RTE_ETH_FLOW_NONFRAG_IPV6_OTHER) | \ (1UL << RTE_ETH_FLOW_L2_PAYLOAD)) -static int eth_i40e_dev_init(\ - __attribute__((unused)) struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev); +static int eth_i40e_dev_init(struct rte_eth_dev *eth_dev); static int i40e_dev_configure(struct rte_eth_dev *dev); static int i40e_dev_start(struct rte_eth_dev *dev); static void i40e_dev_stop(struct rte_eth_dev *dev); @@ -364,8 +362,7 @@ static inline void i40e_flex_payload_reg_init(struct i40e_hw *hw) } static int -eth_i40e_dev_init(__rte_unused struct eth_driver *eth_drv, - struct rte_eth_dev *dev) +eth_i40e_dev_init(struct rte_eth_dev *dev) { struct rte_pci_device *pci_dev; struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); diff --git a/lib/librte_pmd_i40e/i40e_ethdev_vf.c b/lib/librte_pmd_i40e/i40e_ethdev_vf.c index f031c19..70eefff 100644 --- a/lib/librte_pmd_i40e/i40e_ethdev_vf.c +++ b/lib/librte_pmd_i40e/i40e_ethdev_vf.c @@ -1149,8 +1149,7 @@ err: } static int -i40evf_dev_init(__rte_unused struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev) +i40evf_dev_init(struct rte_eth_dev *eth_dev) { struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(\ eth_dev->data->dev_private); diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c index 9bdc046..6599ddb 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c +++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c @@ -117,8 +117,7 @@ #define IXGBE_QUEUE_STAT_COUNTERS (sizeof(hw_stats->qprc) / sizeof(hw_stats->qprc[0])) -static int eth_ixgbe_dev_init(struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev); +static int eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev); static int ixgbe_dev_configure(struct rte_eth_dev *dev); static int ixgbe_dev_start(struct rte_eth_dev *dev); static void ixgbe_dev_stop(struct rte_eth_dev *dev); @@ -184,8 +183,7 @@ static void ixgbe_remove_rar(struct rte_eth_dev *dev, uint32_t index); static void ixgbe_dcb_init(struct ixgbe_hw *hw,struct ixgbe_dcb_config *dcb_config); /* For Virtual Function support */ -static int eth_ixgbevf_dev_init(struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev); +static int eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev); static int ixgbevf_dev_configure(struct rte_eth_dev *dev); static int ixgbevf_dev_start(struct rte_eth_dev *dev); static void ixgbevf_dev_stop(struct rte_eth_dev *dev); @@ -718,8 +716,7 @@ ixgbe_swfw_lock_reset(struct ixgbe_hw *hw) * It returns 0 on success. */ static int -eth_ixgbe_dev_init(__attribute__((unused)) struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev) +eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev) { struct rte_pci_device *pci_dev; struct ixgbe_hw *hw = @@ -967,8 +964,7 @@ generate_random_mac_addr(struct ether_addr *mac_addr) * Virtual Function device init */ static int -eth_ixgbevf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev) +eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev) { int diag; uint32_t tc, tcs; diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c b/lib/librte_pmd_virtio/virtio_ethdev.c index d239083..12158e7 100644 --- a/lib/librte_pmd_virtio/virtio_ethdev.c +++ b/lib/librte_pmd_virtio/virtio_ethdev.c @@ -62,8 +62,7 @@ #include "virtqueue.h" -static int eth_virtio_dev_init(struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev); +static int eth_virtio_dev_init(struct rte_eth_dev *eth_dev); static int virtio_dev_configure(struct rte_eth_dev *dev); static int virtio_dev_start(struct rte_eth_dev *dev); static void virtio_dev_stop(struct rte_eth_dev *dev); @@ -1103,8 +1102,7 @@ virtio_interrupt_handler(__rte_unused struct rte_intr_handle *handle, * It returns 0 on success. */ static int -eth_virtio_dev_init(__rte_unused struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev) +eth_virtio_dev_init(struct rte_eth_dev *eth_dev) { struct virtio_hw *hw = eth_dev->data->dev_private; struct virtio_net_config *config; diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c index 6068c60..a2a2aaa 100644 --- a/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c +++ b/lib/librte_pmd_vmxnet3/vmxnet3_ethdev.c @@ -70,8 +70,7 @@ #define PROCESS_SYS_EVENTS 0 -static int eth_vmxnet3_dev_init(struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev); +static int eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev); static int vmxnet3_dev_configure(struct rte_eth_dev *dev); static int vmxnet3_dev_start(struct rte_eth_dev *dev); static void vmxnet3_dev_stop(struct rte_eth_dev *dev); @@ -182,8 +181,7 @@ vmxnet3_disable_intr(struct vmxnet3_hw *hw) * It returns 0 on success. */ static int -eth_vmxnet3_dev_init(__attribute__((unused)) struct eth_driver *eth_drv, - struct rte_eth_dev *eth_dev) +eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev) { struct rte_pci_device *pci_dev; struct vmxnet3_hw *hw = eth_dev->data->dev_private; -- 2.2.2