[dpdk-stable] patch 'net/ena: remove unnecessary cast' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/27/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/75a955f20a31803b97635cef555ea646e7ef7bdc

Thanks.

Kevin Traynor

---
>From 75a955f20a31803b97635cef555ea646e7ef7bdc Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Wed, 29 May 2019 12:14:57 -0700
Subject: [PATCH] net/ena: remove unnecessary cast

[ upstream commit 890728ff21d47960925bbee6b30ff6c50e6a8f46 ]

The device private pointer (dev_private) is of type void *
therefore no cast is necessary in C.

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/ena/ena_ethdev.c | 60 +++++++++++++-----------------------
 1 file changed, 22 insertions(+), 38 deletions(-)

diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 6f424337e..82161f41c 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -518,6 +518,5 @@ static void ena_close(struct rte_eth_dev *dev)
 	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
 	struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(dev->data->dev_private);
+	struct ena_adapter *adapter = dev->data->dev_private;
 
 	if (adapter->state == ENA_ADAPTER_STATE_RUNNING)
@@ -560,6 +559,5 @@ static int ena_rss_reta_update(struct rte_eth_dev *dev,
 			       uint16_t reta_size)
 {
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(dev->data->dev_private);
+	struct ena_adapter *adapter = dev->data->dev_private;
 	struct ena_com_dev *ena_dev = &adapter->ena_dev;
 	int rc, i;
@@ -616,6 +614,5 @@ static int ena_rss_reta_query(struct rte_eth_dev *dev,
 			      uint16_t reta_size)
 {
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(dev->data->dev_private);
+	struct ena_adapter *adapter = dev->data->dev_private;
 	struct ena_com_dev *ena_dev = &adapter->ena_dev;
 	int rc;
@@ -789,7 +786,5 @@ static int ena_link_update(struct rte_eth_dev *dev,
 {
 	struct rte_eth_link *link = &dev->data->dev_link;
-	struct ena_adapter *adapter;
-
-	adapter = (struct ena_adapter *)(dev->data->dev_private);
+	struct ena_adapter *adapter = dev->data->dev_private;
 
 	link->link_status = adapter->link_status ? ETH_LINK_UP : ETH_LINK_DOWN;
@@ -803,6 +798,5 @@ static int ena_queue_start_all(struct rte_eth_dev *dev,
 			       enum ena_ring_type ring_type)
 {
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(dev->data->dev_private);
+	struct ena_adapter *adapter = dev->data->dev_private;
 	struct ena_ring *queues = NULL;
 	int nb_queues;
@@ -909,6 +903,5 @@ ena_calc_queue_size(struct ena_com_dev *ena_dev,
 static void ena_stats_restart(struct rte_eth_dev *dev)
 {
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(dev->data->dev_private);
+	struct ena_adapter *adapter = dev->data->dev_private;
 
 	rte_atomic64_init(&adapter->drv_stats->ierrors);
@@ -921,6 +914,5 @@ static int ena_stats_get(struct rte_eth_dev *dev,
 {
 	struct ena_admin_basic_stats ena_stats;
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(dev->data->dev_private);
+	struct ena_adapter *adapter = dev->data->dev_private;
 	struct ena_com_dev *ena_dev = &adapter->ena_dev;
 	int rc;
@@ -963,5 +955,5 @@ static int ena_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 	ena_assert_msg(dev->data != NULL, "Uninitialized device");
 	ena_assert_msg(dev->data->dev_private != NULL, "Uninitialized device");
-	adapter = (struct ena_adapter *)(dev->data->dev_private);
+	adapter = dev->data->dev_private;
 
 	ena_dev = &adapter->ena_dev;
@@ -987,6 +979,5 @@ static int ena_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 static int ena_start(struct rte_eth_dev *dev)
 {
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(dev->data->dev_private);
+	struct ena_adapter *adapter = dev->data->dev_private;
 	uint64_t ticks;
 	int rc = 0;
@@ -1033,6 +1024,5 @@ err_start_tx:
 static void ena_stop(struct rte_eth_dev *dev)
 {
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(dev->data->dev_private);
+	struct ena_adapter *adapter = dev->data->dev_private;
 	struct ena_com_dev *ena_dev = &adapter->ena_dev;
 	int rc;
@@ -1125,6 +1115,5 @@ static void ena_queue_stop_all(struct rte_eth_dev *dev,
 			      enum ena_ring_type ring_type)
 {
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(dev->data->dev_private);
+	struct ena_adapter *adapter = dev->data->dev_private;
 	struct ena_ring *queues = NULL;
 	uint16_t nb_queues, i;
@@ -1181,6 +1170,5 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,
 {
 	struct ena_ring *txq = NULL;
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(dev->data->dev_private);
+	struct ena_adapter *adapter = dev->data->dev_private;
 	unsigned int i;
 
@@ -1253,6 +1241,5 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,
 			      struct rte_mempool *mp)
 {
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(dev->data->dev_private);
+	struct ena_adapter *adapter = dev->data->dev_private;
 	struct ena_ring *rxq = NULL;
 	int i;
@@ -1493,5 +1480,5 @@ err_mmio_read_less:
 static void ena_interrupt_handler_rte(void *cb_arg)
 {
-	struct ena_adapter *adapter = (struct ena_adapter *)cb_arg;
+	struct ena_adapter *adapter = cb_arg;
 	struct ena_com_dev *ena_dev = &adapter->ena_dev;
 
@@ -1530,5 +1517,5 @@ static void ena_timer_wd_callback(__rte_unused struct rte_timer *timer,
 				  void *arg)
 {
-	struct ena_adapter *adapter = (struct ena_adapter *)arg;
+	struct ena_adapter *adapter = arg;
 	struct rte_eth_dev *dev = adapter->rte_dev;
 
@@ -1565,6 +1552,5 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
 	struct rte_pci_device *pci_dev;
 	struct rte_intr_handle *intr_handle;
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(eth_dev->data->dev_private);
+	struct ena_adapter *adapter = eth_dev->data->dev_private;
 	struct ena_com_dev *ena_dev = &adapter->ena_dev;
 	struct ena_com_dev_get_features_ctx get_feat_ctx;
@@ -1701,6 +1687,5 @@ err:
 static void ena_destroy_device(struct rte_eth_dev *eth_dev)
 {
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(eth_dev->data->dev_private);
+	struct ena_adapter *adapter = eth_dev->data->dev_private;
 	struct ena_com_dev *ena_dev = &adapter->ena_dev;
 
@@ -1741,6 +1726,5 @@ static int eth_ena_dev_uninit(struct rte_eth_dev *eth_dev)
 static int ena_dev_configure(struct rte_eth_dev *dev)
 {
-	struct ena_adapter *adapter =
-		(struct ena_adapter *)(dev->data->dev_private);
+	struct ena_adapter *adapter = dev->data->dev_private;
 
 	adapter->state = ENA_ADAPTER_STATE_CONFIG;
@@ -1788,5 +1772,5 @@ static void ena_infos_get(struct rte_eth_dev *dev,
 	ena_assert_msg(dev->data != NULL, "Uninitialized device");
 	ena_assert_msg(dev->data->dev_private != NULL, "Uninitialized device");
-	adapter = (struct ena_adapter *)(dev->data->dev_private);
+	adapter = dev->data->dev_private;
 
 	ena_dev = &adapter->ena_dev;
@@ -2268,5 +2252,5 @@ static void ena_update_on_link_change(void *adapter_data,
 	uint32_t status;
 
-	adapter = (struct ena_adapter *)adapter_data;
+	adapter = adapter_data;
 	aenq_link_desc = (struct ena_admin_aenq_link_change_desc *)aenq_e;
 	eth_dev = adapter->rte_dev;
@@ -2282,5 +2266,5 @@ static void ena_notification(void *data,
 			     struct ena_admin_aenq_entry *aenq_e)
 {
-	struct ena_adapter *adapter = (struct ena_adapter *)data;
+	struct ena_adapter *adapter = data;
 	struct ena_admin_ena_hw_hints *hints;
 
@@ -2305,5 +2289,5 @@ static void ena_keep_alive(void *adapter_data,
 			   __rte_unused struct ena_admin_aenq_entry *aenq_e)
 {
-	struct ena_adapter *adapter = (struct ena_adapter *)adapter_data;
+	struct ena_adapter *adapter = adapter_data;
 
 	adapter->timestamp_wd = rte_get_timer_cycles();
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-06-24 16:18:55.508884719 +0100
+++ 0008-net-ena-remove-unnecessary-cast.patch	2019-06-24 16:18:54.957432970 +0100
@@ -1 +1 @@
-From 890728ff21d47960925bbee6b30ff6c50e6a8f46 Mon Sep 17 00:00:00 2001
+From 75a955f20a31803b97635cef555ea646e7ef7bdc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 890728ff21d47960925bbee6b30ff6c50e6a8f46 ]
+
@@ -9,2 +10,0 @@
-Cc: stable at dpdk.org
-
@@ -14,2 +14,2 @@
- drivers/net/ena/ena_ethdev.c | 66 +++++++++++++-----------------------
- 1 file changed, 24 insertions(+), 42 deletions(-)
+ drivers/net/ena/ena_ethdev.c | 60 +++++++++++++-----------------------
+ 1 file changed, 22 insertions(+), 38 deletions(-)
@@ -18 +18 @@
-index b6651fc0f..ad9b13189 100644
+index 6f424337e..82161f41c 100644
@@ -21 +21 @@
-@@ -494,6 +494,5 @@ static void ena_close(struct rte_eth_dev *dev)
+@@ -518,6 +518,5 @@ static void ena_close(struct rte_eth_dev *dev)
@@ -29 +29 @@
-@@ -536,6 +535,5 @@ static int ena_rss_reta_update(struct rte_eth_dev *dev,
+@@ -560,6 +559,5 @@ static int ena_rss_reta_update(struct rte_eth_dev *dev,
@@ -37 +37 @@
-@@ -592,6 +590,5 @@ static int ena_rss_reta_query(struct rte_eth_dev *dev,
+@@ -616,6 +614,5 @@ static int ena_rss_reta_query(struct rte_eth_dev *dev,
@@ -45 +45 @@
-@@ -769,7 +766,5 @@ static int ena_link_update(struct rte_eth_dev *dev,
+@@ -789,7 +786,5 @@ static int ena_link_update(struct rte_eth_dev *dev,
@@ -54 +54 @@
-@@ -783,6 +778,5 @@ static int ena_queue_start_all(struct rte_eth_dev *dev,
+@@ -803,6 +798,5 @@ static int ena_queue_start_all(struct rte_eth_dev *dev,
@@ -62 +62 @@
-@@ -929,6 +923,5 @@ ena_calc_queue_size(struct ena_calc_queue_size_ctx *ctx)
+@@ -909,6 +903,5 @@ ena_calc_queue_size(struct ena_com_dev *ena_dev,
@@ -70 +70 @@
-@@ -942,6 +935,5 @@ static int ena_stats_get(struct rte_eth_dev *dev,
+@@ -921,6 +914,5 @@ static int ena_stats_get(struct rte_eth_dev *dev,
@@ -78,3 +78,3 @@
-@@ -1006,5 +998,5 @@ static int ena_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
- 	ena_assert_msg(dev->data != NULL, "Uninitialized device\n");
- 	ena_assert_msg(dev->data->dev_private != NULL, "Uninitialized device\n");
+@@ -963,5 +955,5 @@ static int ena_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
+ 	ena_assert_msg(dev->data != NULL, "Uninitialized device");
+ 	ena_assert_msg(dev->data->dev_private != NULL, "Uninitialized device");
@@ -85 +85 @@
-@@ -1030,6 +1022,5 @@ static int ena_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
+@@ -987,6 +979,5 @@ static int ena_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
@@ -93 +93 @@
-@@ -1077,6 +1068,5 @@ err_start_tx:
+@@ -1033,6 +1024,5 @@ err_start_tx:
@@ -101 +101 @@
-@@ -1170,6 +1160,5 @@ static void ena_queue_stop_all(struct rte_eth_dev *dev,
+@@ -1125,6 +1115,5 @@ static void ena_queue_stop_all(struct rte_eth_dev *dev,
@@ -109 +109 @@
-@@ -1229,6 +1218,5 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,
+@@ -1181,6 +1170,5 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,
@@ -117 +117 @@
-@@ -1314,6 +1302,5 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,
+@@ -1253,6 +1241,5 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,
@@ -125 +125 @@
-@@ -1559,5 +1546,5 @@ err_mmio_read_less:
+@@ -1493,5 +1480,5 @@ err_mmio_read_less:
@@ -132 +132 @@
-@@ -1597,5 +1584,5 @@ static void ena_timer_wd_callback(__rte_unused struct rte_timer *timer,
+@@ -1530,5 +1517,5 @@ static void ena_timer_wd_callback(__rte_unused struct rte_timer *timer,
@@ -139 +139 @@
-@@ -1704,6 +1691,5 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
+@@ -1565,6 +1552,5 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
@@ -147 +147 @@
-@@ -1863,6 +1849,5 @@ err:
+@@ -1701,6 +1687,5 @@ err:
@@ -155 +155 @@
-@@ -1903,6 +1888,5 @@ static int eth_ena_dev_uninit(struct rte_eth_dev *eth_dev)
+@@ -1741,6 +1726,5 @@ static int eth_ena_dev_uninit(struct rte_eth_dev *eth_dev)
@@ -163,3 +163,3 @@
-@@ -1949,5 +1933,5 @@ static void ena_infos_get(struct rte_eth_dev *dev,
- 	ena_assert_msg(dev->data != NULL, "Uninitialized device\n");
- 	ena_assert_msg(dev->data->dev_private != NULL, "Uninitialized device\n");
+@@ -1788,5 +1772,5 @@ static void ena_infos_get(struct rte_eth_dev *dev,
+ 	ena_assert_msg(dev->data != NULL, "Uninitialized device");
+ 	ena_assert_msg(dev->data->dev_private != NULL, "Uninitialized device");
@@ -170,17 +170 @@
-@@ -2507,6 +2491,5 @@ static int ena_xstats_get(struct rte_eth_dev *dev,
- 			  unsigned int n)
- {
--	struct ena_adapter *adapter =
--			(struct ena_adapter *)(dev->data->dev_private);
-+	struct ena_adapter *adapter = dev->data->dev_private;
- 	unsigned int xstats_count = ena_xstats_calc_num(dev);
- 	unsigned int stat, i, count = 0;
-@@ -2559,6 +2542,5 @@ static int ena_xstats_get_by_id(struct rte_eth_dev *dev,
- 				unsigned int n)
- {
--	struct ena_adapter *adapter =
--		(struct ena_adapter *)(dev->data->dev_private);
-+	struct ena_adapter *adapter = dev->data->dev_private;
- 	uint64_t id;
- 	uint64_t rx_entries, tx_entries;
-@@ -2650,5 +2632,5 @@ static void ena_update_on_link_change(void *adapter_data,
+@@ -2268,5 +2252,5 @@ static void ena_update_on_link_change(void *adapter_data,
@@ -193 +177 @@
-@@ -2664,5 +2646,5 @@ static void ena_notification(void *data,
+@@ -2282,5 +2266,5 @@ static void ena_notification(void *data,
@@ -200 +184 @@
-@@ -2687,5 +2669,5 @@ static void ena_keep_alive(void *adapter_data,
+@@ -2305,5 +2289,5 @@ static void ena_keep_alive(void *adapter_data,
@@ -205,2 +189,2 @@
- 	struct ena_admin_aenq_keep_alive_desc *desc;
- 	uint64_t rx_drops;
+ 
+ 	adapter->timestamp_wd = rte_get_timer_cycles();