From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00069.outbound.protection.outlook.com [40.107.0.69]) by dpdk.org (Postfix) with ESMTP id 354EAAAC5 for ; Tue, 5 Jun 2018 02:37:52 +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=VKVWVeeMYhWlyO8FBYZPZgbyHnXuoDKt2sXuInyIiJm3SmK60e3D93Woh2QOvcUorym9yTG6uSy3rMC7BEp2n4uocMOgVaOHd1/SFVOLf2+ek1MBCR7cesV+Vi2pA/JYRGyo4awbulCEUhzWXxsdp7C3JmZjeoevoZB0waYMTJk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by AM5PR0501MB2034.eurprd05.prod.outlook.com (2603:10a6:203:1a::20) 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:37:49 +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:37:17 -0700 Message-Id: <20180605003721.14367-7-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605003721.14367-1-yskoh@mellanox.com> References: <20180605002732.13866-1-yskoh@mellanox.com> <20180605003721.14367-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: BYAPR03CA0027.namprd03.prod.outlook.com (2603:10b6:a02:a8::40) To AM5PR0501MB2034.eurprd05.prod.outlook.com (2603:10a6:203:1a::20) 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:AM5PR0501MB2034; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2034; 3:YLb6L3mRopeUnOM4/3VVIetHYb3snpcfDNXTJ1uDhQPgzgtgv4Pf+VTN+UUa5oVooFP4lvT7023GamfKeLQX0vduiX9NhFk+KXGZMluxHXlohI6ccQetp0YPBU34nrbELkJ80kfMMO9U+eJKyDd2qL/JzF44YwcgGpS6MPyLRl2KJy+FRf/Rb59MMV0pGhpxBBL5c8kvYpmdJQCspcJv2GXF7phKG6RcWYlttIL3XwxCN02vgROmFV+rq6z4UxQ0; 25:N5LI2VW/Tn9IWpNRs69vhHp3XtYUtFmpzRXwP+N6T7Bp7O14ps/sRz6qZAMnV7FnP1d8Tl9S2404puKVXzh1Ml4+hsQdqwKOfgdFExhBll9x2MKwA2Xq28tO51VyqKcW28HSQy1DKb1TlPO2qZbQOg1pnPnfa2XiYAIjLRyJFGcsU2ce7ER1+1MfAG6PiFI3RjA7OoM0gjpTx88Rz67JYWd6FTP2KEgOZZrJ1DrxCana03pEqKsVV7iM4ShRCJsggIr4J9i70e39nwxkoLUYDMTjtZJ642qMXBwywu/ebrElzhWCZaiS7LRYmIEULNNpKRykw1pGXamP6pu5vwqOqg==; 31:FvC/nrqpLCC6RfVWrySdBLWTV98+e5ytgyd2uic3O6HClEOnUNEuYRyWzwd6+XB0Y9uya2oDsRm/OVPNd0jOqL3eS9JN7G5nOeD1Ba/ifPRDvacIHjn5ehPUODfLLiE630GJcREh7+fV8LKOw2JtHsKsEpGu0bWd+wmG5no1rf21TqjW22xt9iZnTu2QqRyeICuTVpUiR9hmeJKE3reACVGVvmHc2fDhcUVfM+qXtzI= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2034: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2034; 20:xQn8Mpvu872PdLfrWq2QAnyOfin4r2aUXzL1QEqS81xMw3H3IjojLVWOaUqX7FAdeb0+du85SySXrOFQWmuJoALXtVnfbZnhHddDmzqecYlIbx1paw4j16vQnkETiCFYVfvnJVLs0eYIiWmCYzuTP4BGlMlYTlizvAQQUjDua5wowIYbp7vN8MTdbp+Eqt6Te2hcL/T63oJdrlXJc+pX8eGq6AzLiQqgNaPLM6lV5HLHrW5FG0mRYLZsRQ1i/053kJpsOnTf7meaI4IcjbP1lKPVNpBRGvPqd/wyLsuoZ9ld5e2JHwt+Z3zcKGiFdyt2fOkWmUzW2A/A/3KvjS+5F5549oW+r2WX4awBr8cMDuqwUB/U0U8P1cetrfsrVIciTuvjzamfmLPIxONyZaTqy7jR2LYYR4bGKAXTEF1Bt6O2Tz3GNYbG0VxFgVpNbe89NzO8bjEMAZRrrFZEYLOkgmi3jBt5VqaL1M0jCE+eJU5IXj+OLxmVOcF4cNcGoekV; 4:6oomqfTnfJp14wgqxI5IAe1wKy7ZnI8OyzZz+Ye/sXr72vX8+lPgpTCnEXN7yeoi3JO/TRyG/Iop0Hdge66Gsws55YWMHDtYBELGCOs5nwVgHq7qQ2pPEg/E3TuH1a7wS9gG/fz1uLQ3T0xGCvR9unUjMo/nqxVsFXeJMyyqThlUhmXkVqHOkdzndVJRf+M8NzWAIRtlWulPcPQNG4H3zF8iEJ7aMAal3ze6B6pj1DsDuJBX10eHXNJjNpLlBu4ChZdgYGYzfQicPcCXFkiK4Q== 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)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6072148)(201708071742011)(7699016); SRVR:AM5PR0501MB2034; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2034; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(396003)(366004)(39860400002)(39380400002)(199004)(189003)(81156014)(50226002)(25786009)(69596002)(4326008)(7736002)(8936002)(305945005)(47776003)(76176011)(52116002)(316002)(7696005)(68736007)(53936002)(97736004)(66066001)(86362001)(81166006)(55016002)(59450400001)(8676002)(2906002)(446003)(1076002)(105586002)(2870700001)(50466002)(6916009)(476003)(5660300001)(11346002)(6666003)(23676004)(2616005)(386003)(478600001)(21086003)(486006)(106356001)(36756003)(2351001)(2361001)(186003)(6116002)(16526019)(26005)(3846002)(956004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2034; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTVQUjA1MDFNQjIwMzQ7MjM6clNuaDZTQTNUdEp1TTlYOEFZdVk1Y1oz?= =?utf-8?B?TDhUaHk0VHE2Y1RrYmNDS2ozUTV0ZEJVRHppZHpHajA4QlpWditadWg2TU1S?= =?utf-8?B?WTAyWktxMjBjM2h3VUdURjhlTG5MeTRseEJXTkNqd0pVeHU4QnRDOCtYUmNp?= =?utf-8?B?YVlETFdUMkdsZmRHVnUvSUhad2Erc0JqZDdtRjB3K25tMFdXREdyVnNKMC9o?= =?utf-8?B?eE5FMmZKMGhVRlU0bmRicTNkSi9oZ3RnTnlRUFYrUXBxWkd1NGNiOWdwYnpy?= =?utf-8?B?N29leEY0NlBDeVFGQ1hHcE9ycU04VGU0eWt5NnNoeWY4RGh2WGdIZnljQzZY?= =?utf-8?B?aVZBTVk4QWEwQ05CeVJBenc1aVMyVHNoQ1BNT1YzZlV6VFFEZXVFNDd2Qkk0?= =?utf-8?B?S0VJVi9jcTFaUWhNa0x4aTcrR2FnU003RWszMWV1Q0NSa0ptSDQ1OU95dzF5?= =?utf-8?B?VmpXWnJnUU11SjJQWHhYeDFmSmhpUVY5bFZhdE9WYUpVZDRwS3ZaZkhDU2Jq?= =?utf-8?B?MnZyNHkwbUo0WnZlc3R0SU9kK2g5TStUOWdtckl1T3RNOUxaOWYxQ1pIZ2dk?= =?utf-8?B?MDh2OEFMQzZtSytmbndLRjhkNlFjVEsyM3E4K29HVEpxMTlRbUJIUFdYYkVT?= =?utf-8?B?b0lRdHlzNGpRVkFlaENOb1d2cjJHQkhSRjdHUC9DMy96bjBFM3U3cS9Lb2pk?= =?utf-8?B?TUFqMElJQ3NHMGZVSWV6dmpOTEthMHozQkZjNWN5TDVYK1JWVkZaMDU0N09s?= =?utf-8?B?V1luTnBFZTgzL3o3cndBdXc5TWRvYXdEWDZ6eTFzNFJubnFxTytNYURHSWhk?= =?utf-8?B?ZHFCbFhJRFNaZktFRHY1bElaYUZOdGdzTExzeDJXQWtPQklMZ2MxM1FwT2RI?= =?utf-8?B?L0ZlcUJEWlBQUE50Zy90S1JHNVFiQ1Qrck9aTGFrTDZzaGdRbmhqRkFsbS8v?= =?utf-8?B?SE0ya09UeWlRRVR2OUZjNFNnam1IZlovZnpWejd6eHdCWGdEcGxVYThRZkc4?= =?utf-8?B?SlVpS1ovb2ZZVVNEQnBZRnpDcWh4ZXlNYStRVFNzc2lSU3MzR2ptRitxaEJJ?= =?utf-8?B?VWw1bzhIM2xBK3NaZGxwZFZGOUxIL21oaXoycmNKZWsrTVo5WU83S0tWYk5i?= =?utf-8?B?aWtERlYxN1NoVVlzMnBjWnJZaSs4bzdrdTNDSmx3NC9DUEVJb0gwZmFUQ21a?= =?utf-8?B?dm9FblVhSER2YU9LZGFxazlmVDl2NHYwaEM3amhEeFhsZlBjcHcvbGtXMjY1?= =?utf-8?B?ZGswS0RSY1hWSFIzcXp1VXN0SjQxWndyVUd2Nnh0T3dRa1FSeHp4Qmg1U2Ux?= =?utf-8?B?cTVxWXJ2em9LVnU1YUQvTzd3blFXcGVtbDNoWnNLRU53b1gzTGhoaGhVMTVm?= =?utf-8?B?NW5qTStZVWFXMTk0YStDNjl0Z0hBQzZNb2M1NnRDUXpHZFJyWEU4T0c2U1NZ?= =?utf-8?B?Y3JYdVBqZm1qU2U5czg2L3c4RU5FV1dta1FGczNTcDlvY2R5NW54TnZUVkRq?= =?utf-8?B?dTFhM0RjekVsTjI0UWlLM1dxY2NNVmVoMVlZOTB0MVBDcU1BQXk0Y3Z3T2Jz?= =?utf-8?B?bDBESlNzakN4Z2l0WU9RYjYvdkxRajhoQXFKeXFwaXpOWUtvbWNKRXg0Z3BP?= =?utf-8?B?RGYrVEVsOUEzMXpNd1RZS0h1RkVlSmZSZW0zcXpJaklENlRzdS9CYU41Yk1v?= =?utf-8?Q?vk0oO/7P1q1JDRyb1BTuyJtYNx4lPNxiv5pO9tGI0?= X-Microsoft-Antispam-Message-Info: z7BkoBJKDYKec6ETV3ly0TibwUuNMnCbXJupq/94myGvaQHX7ymDGpHn3b/5STJU4gZz4V5KWN34AoMQJM6szmm9PcUCPY0a1MUQiICGGNBN26g56aqccOGd8CGPkcyVHbp9m3tH23hsoOXIgfOSI5msMx6F2rNflThKC37JzDX28TLE0mVmtO57dav9MPB1 X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2034; 6:HcJei/THoI3GI0EYjZduSiLnKscT2vJbfLeIgyDXBbzbqloO7MI1NuJ7cpzuiMLZJKhcIacE0OeT8PW+Xl4IYEZpPa3xYbirSrJfdYzLTalR//AEzUAVDdOaYW4EKaLDNnOMZ6jhNWIj1gld6siy3JHNs2MBC9N0KJpbJ6ZKS9VZy+gurBjQw/6WU6NwZcowNF02JWaXGHy+wQAAi0w6oHBP4BiXPw/8mtrp+cehTcFIeNdflybnhecvONqDHagqu76Gd0JZjUWAst6SdmqSzE6sY2wRGMQeYF6zGBqUj1bJXHtPS9io1tthswfB63Zi6J55SM6I11C79TBxsbaH+nadA7ZtomkvEu2MheumyL8JvtV/GVUoS0SEISznNTmpGhqgg6+GBi83I1LaDE7s73PKLXGs5XHvBBdKi8JVWbZJ0FzH8VDJmfiKwkHSTlQphZ9IA94pyTnjtP59zRC8lg==; 5:11300UblesWvsDiAMJMkmyVarYP7VP1axIurOgMhzlNQ80pGFum+hFNmTMj1qM7HHWv8DPy/fa3vW62UBva0lCvIwybUx85CYPi2ZllpucLUwm1cpKiWIk6aFk6Y5vk+yZqBZOFTKGbNUZWVqQo4wnpTVvc/q77LKSGSj9x4Bwc=; 24:IFHXnzS56/PjzkJa+YScmPIanmbEAG3OIszcrecqmNwgMBJZjgaX2tRXOuKo1VXNTstFYC7ZYfD9/MZiuXu8+kcQXyDjzugIDPUxEaz1UTA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2034; 7:iObMx0Byp1lYjwGe4WKa2gZW0Ji9uLVyTTbeXDHEuKCt5ncVANnYLLFRjdTVTGyRxGyae9gmLETddjKe2ghOeEAhjbzHqkNOS/3meP+9qTGklICzZVWDfXt89Xyfi/51s13tIvWfpJxk6z1ukSd9jRGF5sMudrlmAuo6Cxf9OV+aLGB0wKrvmBysywwEp03C2v+WhMZV7gxP4FeS+NIzThNnGSb4d1HgJzL8k6wUgyeGzBx9S9TrLRhemPePGalU X-MS-Office365-Filtering-Correlation-Id: 5634fda5-36c2-4ed6-b8f3-08d5ca7c91b4 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:37:49.9838 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5634fda5-36c2-4ed6-b8f3-08d5ca7c91b4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2034 Subject: [dpdk-stable] [PATCH v2 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:37:52 -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