From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0078.outbound.protection.outlook.com [104.47.1.78]) by dpdk.org (Postfix) with ESMTP id 002F12C02 for ; Tue, 5 Jun 2018 02:12:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MqSzRbenWIluzK9zYuTCYEa77n5RfeBqXL0qz7V0D28=; b=BxpRNI0zOlYRZTIoRZFUDvk+pj7FbuI3xVSTt8LrQY/e0SmCySdxz0kvWP8neTJtXkEiFelOACsPQPqXtHQteQw+N1bYbIZ2g1beazPTcuYz47Jq4PG+WUFfezeT8xh/X4iEtBlThXWeXm7gw0EvV1eUteXxW42jMOaCtX/5Rn0= Received: from mellanox.com (209.116.155.178) by AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 5 Jun 2018 00:12:44 +0000 From: Yongseok Koh To: yliu@fridaylinux.org Cc: stable@dpdk.org, shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Date: Mon, 4 Jun 2018 17:10:48 -0700 Message-Id: <20180605001129.13184-27-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605001129.13184-1-yskoh@mellanox.com> References: <20180605001129.13184-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CO1PR15CA0060.namprd15.prod.outlook.com (2603:10b6:101:1f::28) To AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0501MB2036; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 3:DXt2s978//Owlp9lnQz5agBqiMUid4hMjqS5H1k+R+Bt9x+oihkPt2b8joeY3xMxZmytgfuoZyV1Lq8dyTp3UuV7UCmVfOBl34ELA1vhIsjT5IH9yWw3jGu6TbsnPtuy20Gr57KafdrW+x23gEOogTzhB+Y0aRbXOSuk1lPgTGI+vqO9sUHbleWIJaMSmM7Hn2aEqLbeOlUp5l01w2BQjH4dlu40rqoSLTdCBJHrD2hEKP07rm/MUN1Q7tJkke2e; 25:Mqw4L3iVTVdHCLpc0ZqULriDBBzHTqYR1tstbrqroI+08mIzTA5akaBELSbMc3pRLonS5Z3yxoFdA98VbD8X9PghCQDHzvsrcJ9bwcH/WQEhulcQsJaKDg+ZL3Gmhzr3pHVwoJ0VbN+Q1MB7ln9g3qQLrCXmjJR4WKWtBa3jRIrgNX6qP5WAK2BfDFGdOlYCKLa3gu7UrEIDVzTMUge2N6B1EK0UWZOXXjWBiMdNJUENbveP+1eVYYjc2b/iql2GcYg+ocNk2oF3ND+xnOffBIdlQe5/BvyynTMd9hzFyChxL7MN+nCMeMOp7Z/NazouYEi91b6CbzMnYUaMAH7Sbw==; 31:3Yt9RAchEAizV65oTM8k5OOJRkJHldsPzZcWSJ3u7pWY8VbJ+xe6S251YKTeyozNkRY0cwYhYrKhE7e9+lEG8ilWQRCqrxNHCygyiyMvoGR2X7MiP9MSXR+5ejQyJL0sjyX39ak17LTpgB8/VInYVn5zgcD18U//RzVcHRpMvC7C6pMv1MR6fhcoMiAVattWSfmUQ4Li8ZikHIqJxjM9dZoC2Fsm+RogSPnvY2XY98Y= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2036: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 20:XOBpbT7BOYOU1APGFi9owPFWDSrjcxOCIkADZ+BUPncFOlbaz1OV7T0OxdJlnNK8BgGkVJw/IAGVjTUMqwwSlIgn/2s7rUtRIgRqKeazNEXqGGFpSRHne0u8IWeKG5OlRrh5J0Wn3XQt4LcD+oJyrAMcf5uRZNiMTm04UeW0BAS1nn+aLvFDfPJQ8b0RyjqKn95eHJOyviCXV+ra3ujVDf93397P2XNP1G6R+aCpBefIjvG9ylwnod7VM8HDRKBayemHf1pZFj/2vwbradjm/gZWB6jxpfnW2Zo+RETQNxpBgG7j+rFkHCLAtxvbTeLkTqTyaWRZ5lhFY3SOr7IV3sAYW9bYORZtuy8SyHFy+UcsnRSHfbVQnTePJc/W+C+0PaztvzqQaLaoFS8h5JlNFDyfNWqhY2Bty8Odev/iBzYN/tatE06H9jtdAUeJI9FTLQDB1O9uSrCBpkNbRx7Yd4Vqbm/AC7BfN0o/XuvvBQolPoUg6UNpfpy6YzfVzJeQ; 4:8QSh/oj4rtRQ1owHVN6zQhhtaKhnopEoLK8DTbxAwZi4KGysnfT8T7p/LKeB2Lh9uaFFD0Zg6Xs0STZQtMMUkCni/feQi1SWOjmt2eVtir/ihEIqQlhhoxcaPVVjWdush5vyaaIWF6yq5Wqn0hcXZqI8LtcrkVAO0nEFAwegjhA058lxWNAlNcfVoDdcVbB19bjBji6jWb2vjbRuROFtPOKmITXJSWa3ospWYcsw8Iyg4p2YpS/cDcFA0/QnOFiEzlXYhfNdDYEhTZpr3bOngg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM5PR0501MB2036; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2036; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(366004)(396003)(39860400002)(346002)(376002)(189003)(199004)(478600001)(81156014)(76176011)(7696005)(956004)(2361001)(50226002)(305945005)(2616005)(50466002)(47776003)(486006)(97736004)(5660300001)(2351001)(106356001)(8936002)(186003)(81166006)(52116002)(6116002)(476003)(6916009)(23676004)(386003)(446003)(11346002)(59450400001)(66066001)(26005)(3846002)(8676002)(16526019)(1076002)(25786009)(21086003)(86362001)(2870700001)(53936002)(4326008)(2906002)(316002)(55016002)(36756003)(105586002)(69596002)(68736007)(7736002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2036; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTVQUjA1MDFNQjIwMzY7MjM6WnNKZVhJNUVoUlI2ZEV2WnFqcmxOdDZm?= =?utf-8?B?aElGbGRCdi9tWTlPdElSTjBxaTJOVXVxSko4dWZjRHcrdTRINlRJelRDcDFH?= =?utf-8?B?Y09jSElOcWtneGN5RUZJQjVsdkpGaGpTWU5WOVBFck1ZZUhQVzUycklNeno0?= =?utf-8?B?YVB3cFhFcVhHNy9NWWEyaHRDNUJTejVVZVZzQTFuOXNwRVdEN05GOFA2RHZE?= =?utf-8?B?VzJ4dnJmM2QxM1cvNGVsVlBtNDJKSFhOd09DZWNxQnBEMy9YS1VaMC94RHIz?= =?utf-8?B?K2FUWEVqZ1ZmNnp2RkFFYTllUXhqcHBFeDVyM1NWTlF1RGhpbTUyaHRCR0tF?= =?utf-8?B?M3pDNlZMbGZRTy9IYWJqOWIyY3pkdUVLS1E2VU80TXZOdnMvUkluZjFMSUhU?= =?utf-8?B?YjZOTXZkdlZxem94UVNKQWRYSmVLczB1amNJcTdmblQ1Mm82OTNtUnE4Z1di?= =?utf-8?B?SFVzUkEzRmRXdFhGZ08xenJJa2NkR2xZMEJGWFhNdEN4UDZ0dzFKRmRJRVox?= =?utf-8?B?ekRDYlNrSUgyendDaVVuM2tEVHhBT2pNamZlTDl5NzQ3dCtNNVJyNWJ4aDAx?= =?utf-8?B?dzhWYUpxYm8rQTNLek83d1hjS3pLZ3dhN2ZhM1ppOGo0RkM2K0dsSUtmcStU?= =?utf-8?B?Y0RhTHphWitCcnd2cEZZdjlaQWdlMENPQWJCNEttS1RTWlpTWWFMUUdjamZU?= =?utf-8?B?UStRUGRYYVR4ZmpMQWRDRDNaOEtxT045eHA0SGU1SXB0Qit5MTdSRHJ3R0tC?= =?utf-8?B?TzJTbElDWnJ3TFl3ejBRVXB2K3RBajFnZWtnMHcvQmhZQTM5ZW9zaVZMRlRC?= =?utf-8?B?eGcxZUxKNC9GMkN4d1haR3Ywblp1REZyak0xTWFIMHdyZ3N3ZUF4My9FNzVN?= =?utf-8?B?ODFxUUgzUnhQdUV6NU9tQjN6MEZFWDdEczlyTnE5b0wvd2FlUzM2Mkp3S0kv?= =?utf-8?B?YXk4N2w3VDNabDRXK2VBcFdibENVN0NYUVh2OUxGSTc2SURncjR6Rit4cnhO?= =?utf-8?B?TnMvR2hIZkNmL2x0TGp0ZjhYd1lTTXhjQUhzZ21BZ0YvWW1nNEN4WHBoRnor?= =?utf-8?B?eDRuWEU4OTRLM3FETjhjRmxRUmw5RFFlRlQxN3FkUVNKN2JRZGJSd1F1czNa?= =?utf-8?B?MVZ2V2tubzEvSHBsY0ZDR0V0UEhEQlY4eE5yNUNJNWZqdkU5cWplY2lXMmli?= =?utf-8?B?SFdQUysrcFAvbHFFbHhoWE9JZ1EydzA0dFd0Z0NsY2tqVi9tcW5lWGk1dHh6?= =?utf-8?B?YnU5K2tCeWtIRXhHOGJVem0zNnhGL01rWlMzZmRhc2hLQ1FpMTJwWGZaRkRS?= =?utf-8?B?d0s0YVB0T0VCa3RhZHVNV1lhOHJBWFNlSUgxQ25WSVA5R1lLcUlrWUFkN2lG?= =?utf-8?B?c2x1WnlvSlpwZHRBbE1vRmtVckZ6VExlVUFqZVUyUFlha0xhc0NZdFFFQ0dn?= =?utf-8?B?R3liSUQ2UngzeTJNWlBBUU1zVU9mS21iWk1NR3d2anptNG9DZE0vUjFYTTFJ?= =?utf-8?B?TWlvZmZpMUdpWGFrQjdqelQwS0E0TVMxQktoM0hwejBTMWt0UVN5R3oyblpU?= =?utf-8?B?NXlEWHJJeUdwamlJZVpoYmpPN1VvV3hQWEhVMi9KSHdEY0x4aWIxV1MrMVpU?= =?utf-8?B?eTVlOEpPbTdDUTJSejRxK0UyRHB4cTZnbVpjRlY5SWE1MmNjNzh3bWVTM21T?= =?utf-8?Q?5vXsh/jsi6d10Sl5ENM1/ljJogVZc/OCBTM2GQP7p?= X-Microsoft-Antispam-Message-Info: Hsa0m3LIj38pZXIKoOz4e9y0+GJPcgBXYoND2CdGh4QUb/Y5U9Tn5sEFW7iDXEEmeUsN3ZBKQ7Q8bfxyxebarr2shG0y/P6lEZaDrAtGNpGxIu7d3nt+v8+fulN4Ia3hPC3kHq5g3Vp4dszohJKHXBmylQXGydazmsPzzpNveIslL5nvD0lJfBVFy2SQtU0F X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 6:8VGZn3TxLvPccCsei8KM1u0d1SmDUAT4dOj6OEqWFDdBaW/6YSGDCIFx9Sy9moGF6x/uQHRBA5PKpy/mXIvLmFoICF5q4oID36cs9E/TUhesEGv1UYS0Yva/z1Pfc4FNUTpVAmj9ds38LLLx6m8FjyfWp24GJRS9BC2UJOBBEyqz4aAdL9d80I4Vh7N0+y/YR++0KZ/Hxi2N9PF5yFVfqNxHbaIPxO+A0dUMm8cWiaujLEiFVc59QYSqGxI3yn/cFy0Ey6iYCRi+qgT/Ln00ubXSJjE+uhGpYvuc1sGnJzLwUyETHuT4ysKgY/6tGYQjBAPx4ADf2zhXrYYjYFSau4sY8eoU6Cca8TgDkkkQ3Rb9XVOkYTov9CLlTjBNryaRMeon6ebGo8uYGUDiZ14imwBI6B7sa9S/LSmmMKlh6TkszlT606WgrTvoy3fViPVBGQ+mhS9NSh8HSKIrAgMWrQ==; 5:hqtVgXl0joLSElRu2Gx6CiviyZImUS1V7LfLIUvVwDme5Ze3xYvXIpoFJknv2Da0hw+KCXJN/Voivx7MzLVWCP8LKXFJLH+8nMQnD18PeGcQ0bbBm2jvf6ntCzi1gOVdiZihnQ4Su8+3M9iqrq2XIiEUdr0Ki+hFH/2D6epAwJw=; 24:Kj1wW+j3MQ1u5ATp9TJ0LvcvjIhiILAdd8EJaFNVAkAI2u4iTr7Vjnric+cV9/GybXRBklXn69rE3ZFDYDTIZCLPayEKM2mse1obcm0h7g0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 7:SQCpguPgcl+0zWJZbh7IET0vTSgvt9YNZ3J3EthsctX3UERmOnTwsURY7Qp5fMJDlf3olW5lP9E95HOxCvppf3zRHVhUo4LJv2EPMGOZ/yuJGVTUAYmZY9tqXk4+9vh0qDWUETZ8qSxWqQKi2J9iy1QgosjLYOjU1Y17Tcbv7SWeOvC4RUI264JsYDO+BQC0P8uW2I0KLFYy72wZFMVKaVnsupvsN+cUy9pN3oh4fXq3jJ4lU7A++mEIG0cN5wSE X-MS-Office365-Filtering-Correlation-Id: 002e7964-f057-4a93-9077-08d5ca791063 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:12:44.3700 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 002e7964-f057-4a93-9077-08d5ca791063 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2036 Subject: [dpdk-stable] [PATCH 26/67] net/mlx5: change non failing function return values 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: , X-List-Received-Date: Tue, 05 Jun 2018 00:12:47 -0000 From: Nélio Laranjeiro [ upstream commit 925061b58b487fba57f55847b1447417fed715fb ] These functions return int although they are not supposed to fail, resulting in unnecessary checks in their callers. Some are returning error where is should be a boolean. Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5.h | 4 ++-- drivers/net/mlx5/mlx5_mr.c | 4 ++-- drivers/net/mlx5/mlx5_rxq.c | 25 ++++++++++--------------- drivers/net/mlx5/mlx5_socket.c | 6 +----- drivers/net/mlx5/mlx5_trigger.c | 6 +----- drivers/net/mlx5/mlx5_txq.c | 17 ++++++----------- 6 files changed, 22 insertions(+), 40 deletions(-) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 5814ec051..8ecee0212 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -255,7 +255,7 @@ int mlx5_vlan_offload_set(struct rte_eth_dev *dev, int mask); int mlx5_dev_start(struct rte_eth_dev *dev); void mlx5_dev_stop(struct rte_eth_dev *dev); int mlx5_traffic_enable(struct rte_eth_dev *dev); -int mlx5_traffic_disable(struct rte_eth_dev *dev); +void mlx5_traffic_disable(struct rte_eth_dev *dev); int mlx5_traffic_restart(struct rte_eth_dev *dev); /* mlx5_flow.c */ @@ -300,7 +300,7 @@ void mlx5_flow_delete_drop_queue(struct rte_eth_dev *dev); /* mlx5_socket.c */ int mlx5_socket_init(struct rte_eth_dev *priv); -int mlx5_socket_uninit(struct rte_eth_dev *priv); +void mlx5_socket_uninit(struct rte_eth_dev *priv); void mlx5_socket_handle(struct rte_eth_dev *priv); int mlx5_socket_connect(struct rte_eth_dev *priv); diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c index 6f60aa1c5..cfad4798b 100644 --- a/drivers/net/mlx5/mlx5_mr.c +++ b/drivers/net/mlx5/mlx5_mr.c @@ -336,7 +336,7 @@ mlx5_mr_get(struct rte_eth_dev *dev, struct rte_mempool *mp) * Pointer to memory region to release. * * @return - * 0 on success, errno on failure. + * 1 while a reference on it exists, 0 when freed. */ int mlx5_mr_release(struct mlx5_mr *mr) @@ -350,7 +350,7 @@ mlx5_mr_release(struct mlx5_mr *mr) rte_free(mr); return 0; } - return EBUSY; + return 1; } /** diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 637092d44..cc1d7ba5d 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -787,7 +787,7 @@ mlx5_rxq_ibv_get(struct rte_eth_dev *dev, uint16_t idx) * Verbs Rx queue object. * * @return - * 0 on success, errno value on failure. + * 1 while a reference on it exists, 0 when freed. */ int mlx5_rxq_ibv_release(struct mlx5_rxq_ibv *rxq_ibv) @@ -813,7 +813,7 @@ mlx5_rxq_ibv_release(struct mlx5_rxq_ibv *rxq_ibv) rte_free(rxq_ibv); return 0; } - return EBUSY; + return 1; } /** @@ -1018,7 +1018,7 @@ mlx5_rxq_get(struct rte_eth_dev *dev, uint16_t idx) * TX queue index. * * @return - * 0 on success, errno value on failure. + * 1 while a reference on it exists, 0 when freed. */ int mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx) @@ -1030,13 +1030,8 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx) return 0; rxq_ctrl = container_of((*priv->rxqs)[idx], struct mlx5_rxq_ctrl, rxq); assert(rxq_ctrl->priv); - if (rxq_ctrl->ibv) { - int ret; - - ret = mlx5_rxq_ibv_release(rxq_ctrl->ibv); - if (!ret) - rxq_ctrl->ibv = NULL; - } + if (rxq_ctrl->ibv && !mlx5_rxq_ibv_release(rxq_ctrl->ibv)) + rxq_ctrl->ibv = NULL; DEBUG("%p: Rx queue %p: refcnt %d", (void *)dev, (void *)rxq_ctrl, rte_atomic32_read(&rxq_ctrl->refcnt)); if (rte_atomic32_dec_and_test(&rxq_ctrl->refcnt)) { @@ -1045,7 +1040,7 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx) (*priv->rxqs)[idx] = NULL; return 0; } - return EBUSY; + return 1; } /** @@ -1205,7 +1200,7 @@ mlx5_ind_table_ibv_get(struct rte_eth_dev *dev, uint16_t queues[], * Indirection table to release. * * @return - * 0 on success, errno value on failure. + * 1 while a reference on it exists, 0 when freed. */ int mlx5_ind_table_ibv_release(struct rte_eth_dev *dev, @@ -1224,7 +1219,7 @@ mlx5_ind_table_ibv_release(struct rte_eth_dev *dev, rte_free(ind_tbl); return 0; } - return EBUSY; + return 1; } /** @@ -1382,7 +1377,7 @@ mlx5_hrxq_get(struct rte_eth_dev *dev, uint8_t *rss_key, uint8_t rss_key_len, * Pointer to Hash Rx queue to release. * * @return - * 0 on success, errno value on failure. + * 1 while a reference on it exists, 0 when freed. */ int mlx5_hrxq_release(struct rte_eth_dev *dev, struct mlx5_hrxq *hrxq) @@ -1397,7 +1392,7 @@ mlx5_hrxq_release(struct rte_eth_dev *dev, struct mlx5_hrxq *hrxq) return 0; } claim_nonzero(mlx5_ind_table_ibv_release(dev, hrxq->ind_table)); - return EBUSY; + return 1; } /** diff --git a/drivers/net/mlx5/mlx5_socket.c b/drivers/net/mlx5/mlx5_socket.c index 57089cb5e..8f400d06e 100644 --- a/drivers/net/mlx5/mlx5_socket.c +++ b/drivers/net/mlx5/mlx5_socket.c @@ -106,11 +106,8 @@ mlx5_socket_init(struct rte_eth_dev *dev) * * @param[in] dev * Pointer to Ethernet device. - * - * @return - * 0 on success, errno value on failure. */ -int +void mlx5_socket_uninit(struct rte_eth_dev *dev) { struct priv *priv = dev->data->dev_private; @@ -119,7 +116,6 @@ mlx5_socket_uninit(struct rte_eth_dev *dev) claim_zero(close(priv->primary_socket)); priv->primary_socket = 0; claim_zero(remove(path)); - return 0; } /** diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index 1941586d3..19434b921 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -390,17 +390,13 @@ mlx5_traffic_enable(struct rte_eth_dev *dev) * * @param dev * Pointer to Ethernet device private data. - * - * @return - * 0 on success. */ -int +void mlx5_traffic_disable(struct rte_eth_dev *dev) { struct priv *priv = dev->data->dev_private; mlx5_flow_list_flush(dev, &priv->ctrl_flows); - return 0; } /** diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index 29bbc0278..53a21c259 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -504,7 +504,7 @@ mlx5_txq_ibv_get(struct rte_eth_dev *dev, uint16_t idx) * Verbs Tx queue object. * * @return - * 0 on success, errno on failure. + * 1 while a reference on it exists, 0 when freed. */ int mlx5_txq_ibv_release(struct mlx5_txq_ibv *txq_ibv) @@ -519,7 +519,7 @@ mlx5_txq_ibv_release(struct mlx5_txq_ibv *txq_ibv) rte_free(txq_ibv); return 0; } - return EBUSY; + return 1; } /** @@ -723,7 +723,7 @@ mlx5_txq_get(struct rte_eth_dev *dev, uint16_t idx) * TX queue index. * * @return - * 0 on success, errno on failure. + * 1 while a reference on it exists, 0 when freed. */ int mlx5_txq_release(struct rte_eth_dev *dev, uint16_t idx) @@ -738,13 +738,8 @@ mlx5_txq_release(struct rte_eth_dev *dev, uint16_t idx) txq = container_of((*priv->txqs)[idx], struct mlx5_txq_ctrl, txq); DEBUG("%p: Tx queue %p: refcnt %d", (void *)dev, (void *)txq, rte_atomic32_read(&txq->refcnt)); - if (txq->ibv) { - int ret; - - ret = mlx5_txq_ibv_release(txq->ibv); - if (!ret) - txq->ibv = NULL; - } + if (txq->ibv && !mlx5_txq_ibv_release(txq->ibv)) + txq->ibv = NULL; for (i = 0; i != MLX5_PMD_TX_MP_CACHE; ++i) { if (txq->txq.mp2mr[i]) { mlx5_mr_release(txq->txq.mp2mr[i]); @@ -761,7 +756,7 @@ mlx5_txq_release(struct rte_eth_dev *dev, uint16_t idx) (*priv->txqs)[idx] = NULL; return 0; } - return EBUSY; + return 1; } /** -- 2.11.0