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 DC2EEA04B5 for ; Tue, 3 Dec 2019 19:29:23 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CF2821BFB7; Tue, 3 Dec 2019 19:29:23 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 4F9F71BFB7 for ; Tue, 3 Dec 2019 19:29:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A4K2BkDB2+Dn5bdNDxniMfUQ+TrehbCZEMGNNLPw6F0=; b=OjozkiE45GFy83NYkWP6TcPzHRuDM5iOzvFfJ41IABNfPWtr9N5N7PF3myzslCO0zoy6pb XBSrCkeptMJoIMypFo3wl5FOpW+jq6BD/naYwc5bYmjh/p1GLheAUr+7GRxPIfi5oKaPIj V4a41JbpRfeHcTMY7pqJplvFCcksSZQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-287-MeBtobhkM8i4UNowDUYKmQ-1; Tue, 03 Dec 2019 13:29:20 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E240E8024C8; Tue, 3 Dec 2019 18:29:18 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA1725C240; Tue, 3 Dec 2019 18:29:17 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Ajit Khaparde , Santoshkumar Karanappa Rastapur , dpdk stable Date: Tue, 3 Dec 2019 18:27:11 +0000 Message-Id: <20191203182714.17297-62-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: MeBtobhkM8i4UNowDUYKmQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/bnxt: remove unnecessary variable assignment' has been queued to LTS release 18.11.6 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.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 12/10/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 rebasi= ng (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/ae66d17b2e4bc379f8= c291a39e62f10d9c391251 Thanks. Kevin. --- >From ae66d17b2e4bc379f8c291a39e62f10d9c391251 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 df80ce22f..fb5328adc 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -370,8 +370,7 @@ bnxt_rx_queue_intr_enable_op(struct rte_eth_dev *eth_de= v, uint16_t queue_id) =09if (eth_dev->data->rx_queues) { =09=09rxq =3D eth_dev->data->rx_queues[queue_id]; -=09=09if (!rxq) { -=09=09=09rc =3D -EINVAL; -=09=09=09return rc; -=09=09} +=09=09if (!rxq) +=09=09=09return -EINVAL; + =09=09cpr =3D rxq->cp_ring; =09=09B_CP_DB_REARM(cpr, cpr->cp_raw_cons); @@ -389,8 +388,7 @@ bnxt_rx_queue_intr_disable_op(struct rte_eth_dev *eth_d= ev, uint16_t queue_id) =09if (eth_dev->data->rx_queues) { =09=09rxq =3D eth_dev->data->rx_queues[queue_id]; -=09=09if (!rxq) { -=09=09=09rc =3D -EINVAL; -=09=09=09return rc; -=09=09} +=09=09if (!rxq) +=09=09=09return -EINVAL; + =09=09cpr =3D rxq->cp_ring; =09=09B_CP_DB_DISARM(cpr); --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:55.336349037 +0000 +++ 0062-net-bnxt-remove-unnecessary-variable-assignment.patch=092019-12-03= 17:29:51.796748995 +0000 @@ -1 +1 @@ -From cd30e6a7239ce48c8b618c87b10ee5db094d9853 Mon Sep 17 00:00:00 2001 +From ae66d17b2e4bc379f8c291a39e62f10d9c391251 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cd30e6a7239ce48c8b618c87b10ee5db094d9853 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index a46f96827..e1ed360ef 100644 +index df80ce22f..fb5328adc 100644 @@ -23 +24 @@ -@@ -385,8 +385,7 @@ bnxt_rx_queue_intr_enable_op(struct rte_eth_dev *eth_d= ev, uint16_t queue_id) +@@ -370,8 +370,7 @@ bnxt_rx_queue_intr_enable_op(struct rte_eth_dev *eth_d= ev, uint16_t queue_id) @@ -35 +36 @@ -@@ -409,8 +408,7 @@ bnxt_rx_queue_intr_disable_op(struct rte_eth_dev *eth_= dev, uint16_t queue_id) +@@ -389,8 +388,7 @@ bnxt_rx_queue_intr_disable_op(struct rte_eth_dev *eth_= dev, uint16_t queue_id)