From patchwork Wed Aug 30 02:14:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 130839 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E365041FC8; Wed, 30 Aug 2023 04:15:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F1E3B4027E; Wed, 30 Aug 2023 04:15:27 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2125.outbound.protection.outlook.com [40.107.220.125]) by mails.dpdk.org (Postfix) with ESMTP id A18C440276 for ; Wed, 30 Aug 2023 04:15:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qv1cUtw6OE1R74HTB7gFhkHSotQzQpbo+qXKe8aR7CSSgA/oPwKNqLrUNyIsXlIUZgXDxXoRc7x8wdyACRUiFXxgRtz3vaYYVTiEjfvumX8D67E2xXdqhqv48vW2Z/oXCy0X/bS0saaBZyYvQ0svWZx6Jg1Eu7KvbN/LSUpuNlwY6i8XDzpFeeEw+IV4jjRwGpGn9v52lUIdF5oChFSqVX3pbSbJyBStEaxT5v7fIcmZ2/Zu5AzK9px0U37EE02F/8MwZmCurXSuTV7zcsAC9Er3488Og7k62xMrZc6gPJi2hTi4f7Z7Vcaq6ww06UN7D6rL7Ep9ljXN/e7ALNZQyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zvWl+qB/SZ+zUqQiGVDXk+Ykk5k2dt7/jLdrYqZJTis=; b=NOYRGRaZmkHK7qi0FWi0Mg9ybHnAvgFmm1BJiXdPrQipMbtllwz2DdIOI4Ms2Eg3QPRfm3AIjb6GrXkgj54tW4dVxHLItv+q9DeGTpQbD3TVnrCudWbL4JVObud34cF2uFEWw+oETDCsIeBjKvxEjPt++ppw+9k5gXeeNNIZVqDwHnvs0q7OJiqOuL6dGTW2dNbXVGSQ5qUcKd3mNP0s36dxCTQ6zZcEF4CbH0PHXOwvSGWKNX6t0C5zMPKjdo6WMQ+xArmfZgldZBJuT+QWSKSI2Fqzn59/byjx/EjVrCrK1teh2YBawVqbWyEVh6psoZxKndRFoG0NjmikW4cq5g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zvWl+qB/SZ+zUqQiGVDXk+Ykk5k2dt7/jLdrYqZJTis=; b=P0aen8DfgQkGxvRlhSZR7vpovrlb4yO9U469ElgQTFqCRRIkBHYCj2rPO3AbwO/rIFNgnvwv9cAMTigsJ8X/b9rsRJpaJ+sbW8AbwTpHIWG0ebDyYuhWJhzwECk9z/GUDzMtTF1e54dfdVnSpH/x9d6PhLY4NnOQX+R0Qes0Hjo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SJ0PR13MB5548.namprd13.prod.outlook.com (2603:10b6:a03:421::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34; Wed, 30 Aug 2023 02:15:23 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::c0f3:c2cc:b5bb:4192]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::c0f3:c2cc:b5bb:4192%4]) with mapi id 15.20.6699.034; Wed, 30 Aug 2023 02:15:22 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 01/27] net/nfp: explicitly compare to null and 0 Date: Wed, 30 Aug 2023 10:14:31 +0800 Message-Id: <20230830021457.2064750-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230830021457.2064750-1-chaoyong.he@corigine.com> References: <20230824110956.1943559-1-chaoyong.he@corigine.com> <20230830021457.2064750-1-chaoyong.he@corigine.com> X-ClientProxiedBy: PH0PR07CA0113.namprd07.prod.outlook.com (2603:10b6:510:4::28) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5548:EE_ X-MS-Office365-Filtering-Correlation-Id: 44473653-ed27-44c8-1116-08dba8fef737 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ly4ZFiQSdccb9C8WlAaovQKukQX14hnvc++7uyFuiTckiixWcB87aoJGdB8TgCJ4sKaw+2TeI3dCDWMirzdTa8mfUQ91NUyxIAn/xH1FhF2QRPht8t6cLe4igMHwIYGAb8vrhijXtguZip8CuiTbbmOV8uBuOPSka21TNkCA0FBZKRV2J7NLyR7YVzNgdGjev0FVtt4YGmxJqvy16P420/9ry9njv0fExgQkBPDFhJ/AfJq79YhiRa3KamNEijBVYKaejWE/NGZfe35STk+800KuQMyTYFpkY3wVgf8veqEi1LL2akFjTTTD5P3jzE8rb+xvWcNGHuOXKIOF7iFJ3uq8Zo2e8vmDDYSQ6e4LU+dzp6S98VSblyR2tOpvr4AMdFV30JG9TNpiGuTki81TuLp7tQo282ofgIoH+OuZ49vSd1Jlt4Qjdt6Hq8ZbtzqL+/x37BDyirZH73BKKGcQZ3v5cd80+6bA+wuUkk27sHIpft0hAM380Ywu4KNiWr7EQkxNdDELz/bGNYC3U9OaxkPzy8i8Fh21gQd29qIRVWCcbLAhtiuRFRMzOp+Va2jp09rkJHcXQICoMejAqdkg2AEmO7zD7zOvL+5+In1KBD649G2Pizvjk+ENH4egNB4Ue/4lVLBLF25nHaHJS8/SEpLHjt1d0fUFUTKkeqWdopY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(396003)(136003)(39830400003)(376002)(366004)(1800799009)(451199024)(186009)(44832011)(4326008)(66556008)(6916009)(2906002)(66476007)(36756003)(66946007)(5660300002)(316002)(8936002)(8676002)(41300700001)(6506007)(6486002)(52116002)(1076003)(26005)(107886003)(6512007)(66574015)(30864003)(2616005)(38350700002)(38100700002)(478600001)(83380400001)(86362001)(6666004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?pjVbn7dSaqNqCEgLIhmGvxXay1aj?= =?utf-8?q?iPzTCNWpnxaImIjIMW4CjhNHvtRszkovQYIPz9yaV7TUfSfpU1hTpqztBj9B1S7NB?= =?utf-8?q?l5snMSQT6Np+VeRIMTrKRfbcbI/xD1jEZ6viQLax9tuiaSVRViRBY7KybiLTxgNLC?= =?utf-8?q?DHU2UVF3qUY4DLiRrh3xOaXCowU0Ao1dMxOn12taXPqtDDu+ZI5hX3vezRi3Vs9lN?= =?utf-8?q?JWB0YFPRzC70t53uuXBvDW1gbyr4uix6vV91/X7vZ5VFOD0lKoY+sjtqOOUaR6g9i?= =?utf-8?q?koo0/13J5sPVMNI+GHceswkSkVdtLEW0y3z7DXgU8kabXnz1ezFOvneFIvhAPuzYi?= =?utf-8?q?bhwhdD3xk+/mwgdyAgOYaxwQfd8a4FdpeZnfnNcAgZVUUMQrIV89BvCuBUGO62hmd?= =?utf-8?q?DT0aqiviPSYTs0jqp04jnEJWKhXDIDM+2ML1bYb5fjyB4Vzlw+bkZcQjxRJ76YdjG?= =?utf-8?q?j1TuU4cn9Mu89ItvS6o2UuodKUn8T41tLOFXSji/xlDs42SVKCRygCf0TQREoAvNg?= =?utf-8?q?ub7owVrmLR/wgVCvQb5p5REJaXvQmJ8XjIZcCRGzEP/sW1adQJVRHSjltMJnyPXNu?= =?utf-8?q?oCOzSeAJEODUY/mGf6kdnPkmfkK5XWDBe9GPDZTl3F3ZWrTkcGIOafe5RGCHCfhtu?= =?utf-8?q?FXw3GgT4hac9pvCB1JZf4zOgHiagUUuSPgpLiYckWPNr4fKPL8VlPR92rlLlKQ9kx?= =?utf-8?q?Vo3WOCG5Gzje7UYvYcbSY3x0PK9yH6nviTbz/QR37bI3eeo36sdHW+GEpTbqikSfM?= =?utf-8?q?na2z+Cg6VGJsabSnQjjvxWjmFzPwKveAx4VPmpIea1VAmsQMAQVhfiUVzblAbY7rA?= =?utf-8?q?2pwwxxHKeiAVDuaWLV5jdNi5iatCGZXFJn4B7dvtqI4Q6rMT+h/r8vITm8rAyo4sE?= =?utf-8?q?CbS6eVoUtoYyz6SrQQB8c45PZrcjmKo4eAgMUxNAtpj/mIdhaYj+tQoWlyqUMchXj?= =?utf-8?q?XmzFToUn3x5+Lswsk+x+tC/6oLnMkhKXfh5Kgl6eTOc+xF3tUVrIUcaoXytdZwO8c?= =?utf-8?q?7/7Ie9so51/RfGrQEkxOlCbm0tPAYq/hxa4SDTjisKqiq14c2lyGJR97eeBb0Z2Vv?= =?utf-8?q?9ZE659Z06XMfxSZ4y+G5wYCf3kdu2ZkeeHQ3UZg/qkqoxJQFmrwnarcbTllk/RthY?= =?utf-8?q?QzayeHx13umELnBX2k93VZFwcnJM+yP+AzqmR+oIYOTl+E2ETQqDuvaj8wFBmnsli?= =?utf-8?q?du9Jmkp/JqBHQYR8NL9wpD2gyVn1gd971C2d6FUYUKYusgnNo+BnbTd4uhmx2Sf7B?= =?utf-8?q?xw2eyl6/FO8bb8I0cWxobGwH99L2EQngLnICJQhW04rWSrZIlI8fr01VZFuxqSi54?= =?utf-8?q?X7/XHIgXBkk9WziqvrGus4RH6wgyUF5hNYNDSHK07+kTKOVK068KcEo4oPn1NhDC6?= =?utf-8?q?1ttCdvkZ1oUi++vB7J39C5VHSwmyimNZkCqNK0014wcYjnfiOjYaKrW+SWB2h1HEY?= =?utf-8?q?BJAc0MV6oE7Ow4dwlvUKbWyTsdGaueKVZPZqHmRvdJ7IhHZJsAAo7/ElcDjUF5iY3?= =?utf-8?q?WYV3MdMO2fG6Br6CqHp7iWx0U7dw8sMb3g=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 44473653-ed27-44c8-1116-08dba8fef737 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2023 02:15:22.9159 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: V+lC82e3nVG+PEzvJkv4/Sgf+R0sTRlOUq1/DjK26lJ+ntnt0x+tARCibkJKxM9kWCRwsxda+sPNVxZvNihWUa+6jOfUebu/BMiCrElRBQ0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5548 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org To compliance with the coding standard, make the pointer variable explicitly comparing to 'NULL' and the integer variable explicitly comparing to '0'. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 12 ++++++------ drivers/net/nfp/nfpcore/nfp_cppcore.c | 14 +++++++------- drivers/net/nfp/nfpcore/nfp_hwinfo.c | 8 ++++---- drivers/net/nfp/nfpcore/nfp_mip.c | 4 ++-- drivers/net/nfp/nfpcore/nfp_mutex.c | 2 +- drivers/net/nfp/nfpcore/nfp_nffw.c | 4 ++-- drivers/net/nfp/nfpcore/nfp_nsp.c | 20 ++++++++++---------- drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 10 +++++----- drivers/net/nfp/nfpcore/nfp_resource.c | 6 +++--- drivers/net/nfp/nfpcore/nfp_rtsym.c | 4 ++-- 10 files changed, 42 insertions(+), 42 deletions(-) diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c index 658c618ee6..2ee60eefc3 100644 --- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c +++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c @@ -224,10 +224,10 @@ nfp_compute_bar(const struct nfp_bar *bar, uint32_t *bar_config, newcfg |= offset >> bitsize; - if (bar_base) + if (bar_base != NULL) *bar_base = offset; - if (bar_config) + if (bar_config != NULL) *bar_config = newcfg; return 0; @@ -266,7 +266,7 @@ nfp_reconfigure_bar(struct nfp_pcie_user *nfp, struct nfp_bar *bar, int tgt, err = nfp_compute_bar(bar, &newcfg, &newbase, tgt, act, tok, offset, size, width); - if (err) + if (err != 0) return err; bar->base = newbase; @@ -515,7 +515,7 @@ nfp6000_area_read(struct nfp_cpp_area *area, void *kernel_vaddr, return -EINVAL; /* Unaligned? Translate to an explicit access */ - if ((priv->offset + offset) & (width - 1)) { + if (((priv->offset + offset) & (width - 1)) != 0) { PMD_DRV_LOG(ERR, "aread_read unaligned!!!"); return -EINVAL; } @@ -583,7 +583,7 @@ nfp6000_area_write(struct nfp_cpp_area *area, const void *kernel_vaddr, return -EINVAL; /* Unaligned? Translate to an explicit access */ - if ((priv->offset + offset) & (width - 1)) + if (((priv->offset + offset) & (width - 1)) != 0) return -EINVAL; is_64 = width == TARGET_WIDTH_64; @@ -764,7 +764,7 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev) if (rte_eal_process_type() == RTE_PROC_PRIMARY && cpp->driver_lock_needed) { ret = nfp_acquire_process_lock(desc); - if (ret) + if (ret != 0) goto error; } diff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c index 6daee313ce..2c6ec3e126 100644 --- a/drivers/net/nfp/nfpcore/nfp_cppcore.c +++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c @@ -235,7 +235,7 @@ nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp, uint32_t destination, if (area == NULL) return NULL; - if (nfp_cpp_area_acquire(area)) { + if (nfp_cpp_area_acquire(area) != 0) { nfp_cpp_area_free(area); return NULL; } @@ -252,7 +252,7 @@ nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp, uint32_t destination, void nfp_cpp_area_free(struct nfp_cpp_area *area) { - if (area->cpp->op->area_cleanup) + if (area->cpp->op->area_cleanup != NULL) area->cpp->op->area_cleanup(area); free(area); } @@ -280,7 +280,7 @@ nfp_cpp_area_release_free(struct nfp_cpp_area *area) int nfp_cpp_area_acquire(struct nfp_cpp_area *area) { - if (area->cpp->op->area_acquire) { + if (area->cpp->op->area_acquire != NULL) { int err = area->cpp->op->area_acquire(area); if (err < 0) @@ -299,7 +299,7 @@ nfp_cpp_area_acquire(struct nfp_cpp_area *area) void nfp_cpp_area_release(struct nfp_cpp_area *area) { - if (area->cpp->op->area_release) + if (area->cpp->op->area_release != NULL) area->cpp->op->area_release(area); } @@ -319,7 +319,7 @@ nfp_cpp_area_iomem(struct nfp_cpp_area *area) { void *iomem = NULL; - if (area->cpp->op->area_iomem) + if (area->cpp->op->area_iomem != NULL) iomem = area->cpp->op->area_iomem(area); return iomem; @@ -621,10 +621,10 @@ nfp_cpp_alloc(struct rte_pci_device *dev, int driver_lock_needed) void nfp_cpp_free(struct nfp_cpp *cpp) { - if (cpp->op && cpp->op->free) + if (cpp->op != NULL && cpp->op->free != NULL) cpp->op->free(cpp); - if (cpp->serial_len) + if (cpp->serial_len != 0) free(cpp->serial); free(cpp); diff --git a/drivers/net/nfp/nfpcore/nfp_hwinfo.c b/drivers/net/nfp/nfpcore/nfp_hwinfo.c index 9054bb0315..a9d166c4dc 100644 --- a/drivers/net/nfp/nfpcore/nfp_hwinfo.c +++ b/drivers/net/nfp/nfpcore/nfp_hwinfo.c @@ -37,7 +37,7 @@ nfp_hwinfo_db_walk(struct nfp_hwinfo *hwinfo, uint32_t size) { const char *key, *val, *end = hwinfo->data + size; - for (key = hwinfo->data; *key && key < end; + for (key = hwinfo->data; *key != 0 && key < end; key = val + strlen(val) + 1) { val = key + strlen(key) + 1; if (val >= end) { @@ -141,7 +141,7 @@ nfp_hwinfo_fetch(struct nfp_cpp *cpp, size_t *hwdb_size) for (;;) { db = nfp_hwinfo_try_fetch(cpp, hwdb_size); - if (db) + if (db != NULL) return db; nanosleep(&wait, NULL); @@ -164,7 +164,7 @@ nfp_hwinfo_read(struct nfp_cpp *cpp) return NULL; err = nfp_hwinfo_db_validate(db, hwdb_size); - if (err) { + if (err != 0) { free(db); return NULL; } @@ -188,7 +188,7 @@ nfp_hwinfo_lookup(struct nfp_hwinfo *hwinfo, const char *lookup) end = hwinfo->data + hwinfo->size - sizeof(uint32_t); - for (key = hwinfo->data; *key && key < end; + for (key = hwinfo->data; *key != 0 && key < end; key = val + strlen(val) + 1) { val = key + strlen(key) + 1; diff --git a/drivers/net/nfp/nfpcore/nfp_mip.c b/drivers/net/nfp/nfpcore/nfp_mip.c index 6b392ad5eb..f9723dd136 100644 --- a/drivers/net/nfp/nfpcore/nfp_mip.c +++ b/drivers/net/nfp/nfpcore/nfp_mip.c @@ -75,7 +75,7 @@ nfp_mip_read_resource(struct nfp_cpp *cpp, struct nfp_mip *mip) return -ENODEV; err = nfp_nffw_info_mip_first(nffw_info, &cpp_id, &addr); - if (err) + if (err != 0) goto exit_close_nffw; err = nfp_mip_try_read(cpp, cpp_id, addr, mip); @@ -105,7 +105,7 @@ nfp_mip_open(struct nfp_cpp *cpp) return NULL; err = nfp_mip_read_resource(cpp, mip); - if (err) { + if (err != 0) { free(mip); return NULL; } diff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c index f967a29351..0410a00856 100644 --- a/drivers/net/nfp/nfpcore/nfp_mutex.c +++ b/drivers/net/nfp/nfpcore/nfp_mutex.c @@ -38,7 +38,7 @@ static int _nfp_cpp_mutex_validate(uint32_t model, int *target, unsigned long long address) { /* Address must be 64-bit aligned */ - if (address & 7) + if ((address & 7) != 0) return -EINVAL; if (NFP_CPP_MODEL_IS_6000(model)) { diff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c index 07d63900dc..433780a5e7 100644 --- a/drivers/net/nfp/nfpcore/nfp_nffw.c +++ b/drivers/net/nfp/nfpcore/nfp_nffw.c @@ -190,7 +190,7 @@ nfp_nffw_info_fwid_first(struct nfp_nffw_info *state) return NULL; for (i = 0; i < cnt; i++) - if (nffw_fwinfo_loaded_get(&fwinfo[i])) + if (nffw_fwinfo_loaded_get(&fwinfo[i]) != 0) return &fwinfo[i]; return NULL; @@ -217,7 +217,7 @@ nfp_nffw_info_mip_first(struct nfp_nffw_info *state, uint32_t *cpp_id, *cpp_id = nffw_fwinfo_mip_cppid_get(fwinfo); *off = nffw_fwinfo_mip_offset_get(fwinfo); - if (nffw_fwinfo_mip_mu_da_get(fwinfo)) { + if (nffw_fwinfo_mip_mu_da_get(fwinfo) != 0) { int locality_off; if (NFP_CPP_ID_TARGET_of(*cpp_id) != NFP_CPP_TARGET_MU) diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c index 1f6b7bd85c..6474abf0c2 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp.c @@ -95,7 +95,7 @@ nfp_nsp_check(struct nfp_nsp *state) return -EINVAL; } - if (reg & NSP_STATUS_BUSY) { + if ((reg & NSP_STATUS_BUSY) != 0) { PMD_DRV_LOG(ERR, "Service processor busy!"); return -EBUSY; } @@ -128,7 +128,7 @@ nfp_nsp_open(struct nfp_cpp *cpp) state->res = res; err = nfp_nsp_check(state); - if (err) { + if (err != 0) { nfp_nsp_close(state); return NULL; } @@ -219,7 +219,7 @@ nfp_nsp_command(struct nfp_nsp *state, uint16_t code, uint32_t option, nsp_buffer = nsp_base + NSP_BUFFER; err = nfp_nsp_check(state); - if (err) + if (err != 0) return err; if (!FIELD_FIT(NSP_BUFFER_CPP, buff_cpp >> 8) || @@ -245,7 +245,7 @@ nfp_nsp_command(struct nfp_nsp *state, uint16_t code, uint32_t option, /* Wait for NSP_COMMAND_START to go to 0 */ err = nfp_nsp_wait_reg(cpp, ®, nsp_cpp, nsp_command, NSP_COMMAND_START, 0); - if (err) { + if (err != 0) { PMD_DRV_LOG(ERR, "Error %d waiting for code 0x%04x to start", err, code); return err; @@ -254,7 +254,7 @@ nfp_nsp_command(struct nfp_nsp *state, uint16_t code, uint32_t option, /* Wait for NSP_STATUS_BUSY to go to 0 */ err = nfp_nsp_wait_reg(cpp, ®, nsp_cpp, nsp_status, NSP_STATUS_BUSY, 0); - if (err) { + if (err != 0) { PMD_DRV_LOG(ERR, "Error %d waiting for code 0x%04x to start", err, code); return err; @@ -266,7 +266,7 @@ nfp_nsp_command(struct nfp_nsp *state, uint16_t code, uint32_t option, ret_val = FIELD_GET(NSP_COMMAND_OPTION, ret_val); err = FIELD_GET(NSP_STATUS_RESULT, reg); - if (err) { + if (err != 0) { PMD_DRV_LOG(ERR, "Result (error) code set: %d (%d) command: %d", -err, (int)ret_val, code); nfp_nsp_print_extended_error(ret_val); @@ -319,13 +319,13 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp, uint16_t code, uint32_t option, cpp_id = FIELD_GET(NSP_BUFFER_CPP, reg) << 8; cpp_buf = FIELD_GET(NSP_BUFFER_ADDRESS, reg); - if (in_buf && in_size) { + if (in_buf != NULL && in_size > 0) { err = nfp_cpp_write(cpp, cpp_id, cpp_buf, in_buf, in_size); if (err < 0) return err; } /* Zero out remaining part of the buffer */ - if (out_buf && out_size && out_size > in_size) { + if (out_buf != NULL && out_size > 0 && out_size > in_size) { memset(out_buf, 0, out_size - in_size); err = nfp_cpp_write(cpp, cpp_id, cpp_buf + in_size, out_buf, out_size - in_size); @@ -337,7 +337,7 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp, uint16_t code, uint32_t option, if (ret < 0) return ret; - if (out_buf && out_size) { + if (out_buf != NULL && out_size > 0) { err = nfp_cpp_read(cpp, cpp_id, cpp_buf, out_buf, out_size); if (err < 0) return err; @@ -369,7 +369,7 @@ nfp_nsp_wait(struct nfp_nsp *state) break; } } - if (err) + if (err != 0) PMD_DRV_LOG(ERR, "NSP failed to respond %d", err); return err; diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c index 01b4652280..825a84a8cd 100644 --- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c +++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c @@ -212,7 +212,7 @@ nfp_eth_port_translate(struct nfp_nsp *nsp, const union eth_table_entry *src, dst->fec_modes_supported |= fec << NFP_FEC_BASER_BIT; fec = FIELD_GET(NSP_ETH_PORT_FEC_SUPP_RS, port); dst->fec_modes_supported |= fec << NFP_FEC_REED_SOLOMON_BIT; - if (dst->fec_modes_supported) + if (dst->fec_modes_supported != 0) dst->fec_modes_supported |= NFP_FEC_AUTO | NFP_FEC_DISABLED; dst->fec = 1 << FIELD_GET(NSP_ETH_STATE_FEC, state); @@ -285,7 +285,7 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp) */ for (i = 0; i < NSP_ETH_MAX_COUNT; i++) { mac = (const struct rte_ether_addr *)entries[i].mac_addr; - if ((entries[i].port & NSP_ETH_PORT_LANES_MASK) && + if ((entries[i].port & NSP_ETH_PORT_LANES_MASK) != 0 && !rte_is_zero_ether_addr(mac)) cnt++; } @@ -294,7 +294,7 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp) * those that give a port count, verify it against the value calculated * above. */ - if (ret && ret != cnt) { + if (ret != 0 && ret != cnt) { PMD_DRV_LOG(ERR, "table entry count (%d) unmatch entries present (%d)", ret, cnt); goto err; @@ -309,7 +309,7 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp) table->count = cnt; for (i = 0, j = 0; i < NSP_ETH_MAX_COUNT; i++) { mac = (const struct rte_ether_addr *)entries[i].mac_addr; - if ((entries[i].port & NSP_ETH_PORT_LANES_MASK) && + if ((entries[i].port & NSP_ETH_PORT_LANES_MASK) != 0 && !rte_is_zero_ether_addr(mac)) nfp_eth_port_translate(nsp, &entries[i], i, &table->ports[j++]); @@ -621,7 +621,7 @@ nfp_eth_set_fec(struct nfp_cpp *cpp, unsigned int idx, enum nfp_eth_fec mode) return -EIO; err = __nfp_eth_set_fec(nsp, mode); - if (err) { + if (err != 0) { nfp_eth_config_cleanup_end(nsp); return err; } diff --git a/drivers/net/nfp/nfpcore/nfp_resource.c b/drivers/net/nfp/nfpcore/nfp_resource.c index 351bc623ed..838cd6e0ef 100644 --- a/drivers/net/nfp/nfpcore/nfp_resource.c +++ b/drivers/net/nfp/nfpcore/nfp_resource.c @@ -115,15 +115,15 @@ nfp_resource_try_acquire(struct nfp_cpp *cpp, struct nfp_resource *res, { int err; - if (nfp_cpp_mutex_lock(dev_mutex)) + if (nfp_cpp_mutex_lock(dev_mutex) != 0) return -EINVAL; err = nfp_cpp_resource_find(cpp, res); - if (err) + if (err != 0) goto err_unlock_dev; err = nfp_cpp_mutex_trylock(res->mutex); - if (err) + if (err != 0) goto err_res_mutex_free; nfp_cpp_mutex_unlock(dev_mutex); diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c index 343b0d0bcf..4c45aec5c1 100644 --- a/drivers/net/nfp/nfpcore/nfp_rtsym.c +++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c @@ -362,10 +362,10 @@ nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl, const char *name, int *error) if (err) err = -EIO; exit: - if (error) + if (error != NULL) *error = err; - if (err) + if (err != 0) return ~0ULL; return val;