From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 87D06A046B for ; Mon, 24 Jun 2019 17:25:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7C8B11BE34; Mon, 24 Jun 2019 17:25:49 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id CADF41BE1E for ; Mon, 24 Jun 2019 17:25:47 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 48DC530832E4; Mon, 24 Jun 2019 15:25:47 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC81919C69; Mon, 24 Jun 2019 15:25:45 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Mon, 24 Jun 2019 16:24:26 +0100 Message-Id: <20190624152525.19349-2-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 24 Jun 2019 15:25:47 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ark: remove unnecessary cast' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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/3fe2b21886eaa8f70b6429eee01575be498161ce Thanks. Kevin Traynor --- >From 3fe2b21886eaa8f70b6429eee01575be498161ce Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 29 May 2019 12:14:51 -0700 Subject: [PATCH] net/ark: remove unnecessary cast [ upstream commit 0bf8b0f16a0ed28175f05cd3aed999ddaed00904 ] The device private pointer (dev_private) is of type void * therefore no cast is necessary in C. Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- drivers/net/ark/ark_ethdev.c | 51 +++++++++++---------------------- drivers/net/ark/ark_ethdev_rx.c | 4 +-- drivers/net/ark/ark_ethdev_tx.c | 2 +- 3 files changed, 20 insertions(+), 37 deletions(-) diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index 4f52e2bd1..af37f75ee 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -242,6 +242,5 @@ static int eth_ark_dev_init(struct rte_eth_dev *dev) { - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; struct rte_pci_device *pci_dev; int ret; @@ -418,6 +417,5 @@ static int ark_config_device(struct rte_eth_dev *dev) { - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; uint16_t num_q, i; struct ark_mpu_t *mpu; @@ -494,6 +492,5 @@ static int eth_ark_dev_uninit(struct rte_eth_dev *dev) { - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; if (rte_eal_process_type() != RTE_PROC_PRIMARY) @@ -517,6 +514,5 @@ eth_ark_dev_configure(struct rte_eth_dev *dev) { PMD_FUNC_LOG(DEBUG, "\n"); - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; eth_ark_dev_set_link_up(dev); @@ -544,6 +540,5 @@ static int eth_ark_dev_start(struct rte_eth_dev *dev) { - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; int i; @@ -597,6 +592,5 @@ eth_ark_dev_stop(struct rte_eth_dev *dev) uint16_t i; int status; - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; struct ark_mpu_t *mpu; @@ -688,6 +682,5 @@ static void eth_ark_dev_close(struct rte_eth_dev *dev) { - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; uint16_t i; @@ -719,6 +712,5 @@ eth_ark_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) { - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; struct ark_mpu_t *tx_mpu = RTE_PTR_ADD(ark->bar0, ARK_MPU_TX_BASE); struct ark_mpu_t *rx_mpu = RTE_PTR_ADD(ark->bar0, ARK_MPU_RX_BASE); @@ -755,6 +747,5 @@ eth_ark_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete) PMD_DEBUG_LOG(DEBUG, "link status = %d\n", dev->data->dev_link.link_status); - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; if (ark->user_ext.link_update) { @@ -770,6 +761,5 @@ eth_ark_dev_set_link_up(struct rte_eth_dev *dev) { dev->data->dev_link.link_status = 1; - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; if (ark->user_ext.dev_set_link_up) @@ -783,6 +773,5 @@ eth_ark_dev_set_link_down(struct rte_eth_dev *dev) { dev->data->dev_link.link_status = 0; - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; if (ark->user_ext.dev_set_link_down) @@ -796,6 +785,5 @@ eth_ark_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) { uint16_t i; - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; stats->ipackets = 0; @@ -820,6 +808,5 @@ eth_ark_dev_stats_reset(struct rte_eth_dev *dev) { uint16_t i; - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; for (i = 0; i < dev->data->nb_tx_queues; i++) @@ -838,6 +825,5 @@ eth_ark_macaddr_add(struct rte_eth_dev *dev, uint32_t pool) { - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; if (ark->user_ext.mac_addr_add) { @@ -855,6 +841,5 @@ static void eth_ark_macaddr_remove(struct rte_eth_dev *dev, uint32_t index) { - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; if (ark->user_ext.mac_addr_remove) @@ -867,6 +852,5 @@ eth_ark_set_default_mac_addr(struct rte_eth_dev *dev, struct ether_addr *mac_addr) { - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; if (ark->user_ext.mac_addr_set) { @@ -881,6 +865,5 @@ static int eth_ark_set_mtu(struct rte_eth_dev *dev, uint16_t size) { - struct ark_adapter *ark = - (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; if (ark->user_ext.set_mtu) diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index 300029d6b..7de1a9851 100644 --- a/drivers/net/ark/ark_ethdev_rx.c +++ b/drivers/net/ark/ark_ethdev_rx.c @@ -122,5 +122,5 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev, { static int warning1; /* = 0 */ - struct ark_adapter *ark = (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; struct ark_rx_queue *queue; @@ -612,5 +612,5 @@ void eth_ark_udm_force_close(struct rte_eth_dev *dev) { - struct ark_adapter *ark = (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; struct ark_rx_queue *queue; uint32_t index; diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c index 94da5f958..196765570 100644 --- a/drivers/net/ark/ark_ethdev_tx.c +++ b/drivers/net/ark/ark_ethdev_tx.c @@ -208,5 +208,5 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev, const struct rte_eth_txconf *tx_conf __rte_unused) { - struct ark_adapter *ark = (struct ark_adapter *)dev->data->dev_private; + struct ark_adapter *ark = dev->data->dev_private; struct ark_tx_queue *queue; int status; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:55.216304001 +0100 +++ 0002-net-ark-remove-unnecessary-cast.patch 2019-06-24 16:18:54.927433678 +0100 @@ -1 +1 @@ -From 0bf8b0f16a0ed28175f05cd3aed999ddaed00904 Mon Sep 17 00:00:00 2001 +From 3fe2b21886eaa8f70b6429eee01575be498161ce Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0bf8b0f16a0ed28175f05cd3aed999ddaed00904 ] + @@ -9,2 +10,0 @@ -Cc: stable@dpdk.org - @@ -20 +20 @@ -index 7692aa2d9..7fd784cd0 100644 +index 4f52e2bd1..af37f75ee 100644 @@ -31 +31 @@ -@@ -419,6 +418,5 @@ static int +@@ -418,6 +417,5 @@ static int @@ -39 +39 @@ -@@ -495,6 +493,5 @@ static int +@@ -494,6 +492,5 @@ static int @@ -47 +47 @@ -@@ -518,6 +515,5 @@ eth_ark_dev_configure(struct rte_eth_dev *dev) +@@ -517,6 +514,5 @@ eth_ark_dev_configure(struct rte_eth_dev *dev) @@ -55 +55 @@ -@@ -545,6 +541,5 @@ static int +@@ -544,6 +540,5 @@ static int @@ -63 +63 @@ -@@ -598,6 +593,5 @@ eth_ark_dev_stop(struct rte_eth_dev *dev) +@@ -597,6 +592,5 @@ eth_ark_dev_stop(struct rte_eth_dev *dev) @@ -71 +71 @@ -@@ -689,6 +683,5 @@ static void +@@ -688,6 +682,5 @@ static void @@ -79 +79 @@ -@@ -720,6 +713,5 @@ eth_ark_dev_info_get(struct rte_eth_dev *dev, +@@ -719,6 +712,5 @@ eth_ark_dev_info_get(struct rte_eth_dev *dev, @@ -87 +87 @@ -@@ -756,6 +748,5 @@ eth_ark_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete) +@@ -755,6 +747,5 @@ eth_ark_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete) @@ -95 +95 @@ -@@ -771,6 +762,5 @@ eth_ark_dev_set_link_up(struct rte_eth_dev *dev) +@@ -770,6 +761,5 @@ eth_ark_dev_set_link_up(struct rte_eth_dev *dev) @@ -103 +103 @@ -@@ -784,6 +774,5 @@ eth_ark_dev_set_link_down(struct rte_eth_dev *dev) +@@ -783,6 +773,5 @@ eth_ark_dev_set_link_down(struct rte_eth_dev *dev) @@ -111 +111 @@ -@@ -797,6 +786,5 @@ eth_ark_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +@@ -796,6 +785,5 @@ eth_ark_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) @@ -119 +119 @@ -@@ -821,6 +809,5 @@ eth_ark_dev_stats_reset(struct rte_eth_dev *dev) +@@ -820,6 +808,5 @@ eth_ark_dev_stats_reset(struct rte_eth_dev *dev) @@ -127 +127 @@ -@@ -839,6 +826,5 @@ eth_ark_macaddr_add(struct rte_eth_dev *dev, +@@ -838,6 +825,5 @@ eth_ark_macaddr_add(struct rte_eth_dev *dev, @@ -135 +135 @@ -@@ -856,6 +842,5 @@ static void +@@ -855,6 +841,5 @@ static void @@ -143,2 +143,2 @@ -@@ -868,6 +853,5 @@ eth_ark_set_default_mac_addr(struct rte_eth_dev *dev, - struct rte_ether_addr *mac_addr) +@@ -867,6 +852,5 @@ eth_ark_set_default_mac_addr(struct rte_eth_dev *dev, + struct ether_addr *mac_addr) @@ -151 +151 @@ -@@ -882,6 +866,5 @@ static int +@@ -881,6 +865,5 @@ static int