From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 45028A04F3 for ; Thu, 19 Dec 2019 15:37:31 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 276451BF92; Thu, 19 Dec 2019 15:37:31 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id A637F1BF71 for ; Thu, 19 Dec 2019 15:37:29 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id d16so6188007wre.10 for ; Thu, 19 Dec 2019 06:37:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sW5CMZk/u3qcdagDnZ7oDe4LQRZxzjqBvHPcAzsNOHw=; b=Bvv5gPO/Gq6Y/hXO8RYFWAfLJO9Gmj9RpV9S8EVKRBQdPVXnLwm82pG4rVqVpNH6Aq 6TeBq1rPdcRApEWNpv/kP9YALGv+Hz6CIGX+v+5mhElLZDSSL6FM9x3YXLNNShTKXBsc clwsCM2U7bzimxlgUESFxmu5HRhaZaRqM5TDornJ/thML1hmCJz6Wo1mk4N6yYP9Mzju 7aZ3/m3TTbO8Uqw6cDKzKjNGtrGLPiWU1csIoDnt5aSLpDgW51O2c/3HC+IckvBCSXiz LhXbXTHZ8bSHRFmg6X6SCXxskDMVkF8C0lfN/fe0hsYmDBqCA9zLlWk/hxuKj6CIHSPW IItg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sW5CMZk/u3qcdagDnZ7oDe4LQRZxzjqBvHPcAzsNOHw=; b=pwFx4PKXtI6zocpSm5bbBtmFaYaOo9JBOsIpsGYWmzyyNnUU64ks4skz1Mx9TlEg6z n+2QlQ/hT/E2fWeyft+0nQol9TJc54Mt2L8xQsFKi/uGIVDZ/EseDcb4xhiKwFqZ+cV6 XC5QWHtr1tOfARiHunxkWCZbYgv3jIG62nX7i0Jka9FL0QFVwI9zsbyavwhRJG0F6i94 d4UjgPhFIq9Q0oFYZaKLSUYoIyFq+WoYwyR/9hTVhyJYWfrC0pZiqq/SqShpFgnXuJAE eM61l3QDTdROwotgzVirzXeGVO1IkqLVWZV00U6fsoqqTHFMHn+6DlkN0U9nMcMBayXJ +OFg== X-Gm-Message-State: APjAAAUtIiR2vrV0CNQD8/n6+TdoYpwcSvZ/4gDlCf+uApRvRYGil+zP LiyiezHwhiRVWmIYNtoAOQM= X-Google-Smtp-Source: APXvYqwBybI7GeDyq9qrnkgj/6uhenQ2v+HAEVIZ+lPnrvKE/UCaEovRrZrPf5ZmMwGtuJcl73pdJQ== X-Received: by 2002:adf:f1c6:: with SMTP id z6mr10309550wro.279.1576766249415; Thu, 19 Dec 2019 06:37:29 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x18sm6640771wrr.75.2019.12.19.06.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:37:28 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , Santoshkumar Karanappa Rastapur , dpdk stable Date: Thu, 19 Dec 2019 14:33:31 +0000 Message-Id: <20191219143447.21506-64-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: remove unnecessary variable assignment' has been queued to LTS release 17.11.10 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 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/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. Thanks. Luca Boccassi --- >From e561b13d96687d3c989170715cd997cfa9870e42 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 9 Oct 2019 18:41:53 -0700 Subject: [PATCH] net/bnxt: remove unnecessary variable assignment [ upstream commit cd30e6a7239ce48c8b618c87b10ee5db094d9853 ] There is no need to assign return value to a temporary variable. Instead return error directly in case of failure. Fixes: 1fe427fd08ee ("net/bnxt: support enable/disable interrupt") Signed-off-by: Kalesh AP Signed-off-by: Ajit Khaparde Reviewed-by: Santoshkumar Karanappa Rastapur --- drivers/net/bnxt/bnxt_rxq.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index cdc5bbfc9f..b42562f802 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -371,10 +371,9 @@ bnxt_rx_queue_intr_enable_op(struct rte_eth_dev *eth_dev, uint16_t queue_id) if (eth_dev->data->rx_queues) { rxq = eth_dev->data->rx_queues[queue_id]; - if (!rxq) { - rc = -EINVAL; - return rc; - } + if (!rxq) + return -EINVAL; + cpr = rxq->cp_ring; B_CP_DB_ARM(cpr); } @@ -390,10 +389,9 @@ bnxt_rx_queue_intr_disable_op(struct rte_eth_dev *eth_dev, uint16_t queue_id) if (eth_dev->data->rx_queues) { rxq = eth_dev->data->rx_queues[queue_id]; - if (!rxq) { - rc = -EINVAL; - return rc; - } + if (!rxq) + return -EINVAL; + cpr = rxq->cp_ring; B_CP_DB_DISARM(cpr); } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:28.877513746 +0000 +++ 0064-net-bnxt-remove-unnecessary-variable-assignment.patch 2019-12-19 14:32:26.141298539 +0000 @@ -1,13 +1,14 @@ -From cd30e6a7239ce48c8b618c87b10ee5db094d9853 Mon Sep 17 00:00:00 2001 +From e561b13d96687d3c989170715cd997cfa9870e42 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 9 Oct 2019 18:41:53 -0700 Subject: [PATCH] net/bnxt: remove unnecessary variable assignment +[ upstream commit cd30e6a7239ce48c8b618c87b10ee5db094d9853 ] + There is no need to assign return value to a temporary variable. Instead return error directly in case of failure. Fixes: 1fe427fd08ee ("net/bnxt: support enable/disable interrupt") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Signed-off-by: Ajit Khaparde @@ -17,10 +18,10 @@ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c -index a46f96827c..e1ed360eff 100644 +index cdc5bbfc9f..b42562f802 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c -@@ -384,10 +384,9 @@ bnxt_rx_queue_intr_enable_op(struct rte_eth_dev *eth_dev, uint16_t queue_id) +@@ -371,10 +371,9 @@ bnxt_rx_queue_intr_enable_op(struct rte_eth_dev *eth_dev, uint16_t queue_id) if (eth_dev->data->rx_queues) { rxq = eth_dev->data->rx_queues[queue_id]; @@ -32,9 +33,9 @@ + return -EINVAL; + cpr = rxq->cp_ring; - B_CP_DB_REARM(cpr, cpr->cp_raw_cons); + B_CP_DB_ARM(cpr); } -@@ -408,10 +407,9 @@ bnxt_rx_queue_intr_disable_op(struct rte_eth_dev *eth_dev, uint16_t queue_id) +@@ -390,10 +389,9 @@ bnxt_rx_queue_intr_disable_op(struct rte_eth_dev *eth_dev, uint16_t queue_id) if (eth_dev->data->rx_queues) { rxq = eth_dev->data->rx_queues[queue_id];