[dpdk-stable] patch 'bus/dpaa: remove logically dead code' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. 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.

Thanks.

Luca Boccassi

---
>From 760665e988f1d6334ed7b69807276b4c0bf92ad3 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Mon, 24 Aug 2020 21:02:39 +0800
Subject: [PATCH] bus/dpaa: remove logically dead code

[ upstream commit 126a2c485c8012ff47bfd4825b9f71d2e606e3b8 ]

This patch removes logically dead code reported by coverity.

Coverity issue: 349930
Fixes: b9c94167904f ("bus/dpaa: decouple FQ portal alloc and init")

Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/bus/dpaa/base/qbman/qman_driver.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c b/drivers/bus/dpaa/base/qbman/qman_driver.c
index 69244ef701..464998fe91 100644
--- a/drivers/bus/dpaa/base/qbman/qman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/qman_driver.c
@@ -179,8 +179,6 @@ struct qman_portal *fsl_qman_fq_portal_create(int *fd)
 	*fd = q_fd;
 	return portal;
 err:
-	if (portal)
-		qman_free_global_portal(portal);
 	if (q_fd)
 		close(q_fd);
 	process_portal_unmap(&q_map.addr);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:12.291699244 +0000
+++ 0016-bus-dpaa-remove-logically-dead-code.patch	2020-10-28 10:35:11.424828846 +0000
@@ -1,13 +1,14 @@
-From 126a2c485c8012ff47bfd4825b9f71d2e606e3b8 Mon Sep 17 00:00:00 2001
+From 760665e988f1d6334ed7b69807276b4c0bf92ad3 Mon Sep 17 00:00:00 2001
 From: Yunjian Wang <wangyunjian at huawei.com>
 Date: Mon, 24 Aug 2020 21:02:39 +0800
 Subject: [PATCH] bus/dpaa: remove logically dead code
 
+[ upstream commit 126a2c485c8012ff47bfd4825b9f71d2e606e3b8 ]
+
 This patch removes logically dead code reported by coverity.
 
 Coverity issue: 349930
 Fixes: b9c94167904f ("bus/dpaa: decouple FQ portal alloc and init")
-Cc: stable at dpdk.org
 
 Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
@@ -16,10 +17,10 @@
  1 file changed, 2 deletions(-)
 
 diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c b/drivers/bus/dpaa/base/qbman/qman_driver.c
-index 1166d68e21..a466c698fc 100644
+index 69244ef701..464998fe91 100644
 --- a/drivers/bus/dpaa/base/qbman/qman_driver.c
 +++ b/drivers/bus/dpaa/base/qbman/qman_driver.c
-@@ -189,8 +189,6 @@ struct qman_portal *fsl_qman_fq_portal_create(int *fd)
+@@ -179,8 +179,6 @@ struct qman_portal *fsl_qman_fq_portal_create(int *fd)
  	*fd = q_fd;
  	return portal;
  err: