Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131595/?format=api
{ "id": 131595, "url": "http://patches.dpdk.org/api/patches/131595/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230919095440.45445-2-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230919095440.45445-2-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230919095440.45445-2-chaoyong.he@corigine.com", "date": "2023-09-19T09:54:15", "name": "[v5,01/26] net/nfp: explicitly compare to null and 0", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "4226a524620678ef57a3f61746841c84b5711340", "submitter": { "id": 2554, "url": "http://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230919095440.45445-2-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29547, "url": "http://patches.dpdk.org/api/series/29547/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29547", "date": "2023-09-19T09:54:14", "name": "refact the nfpcore module", "version": 5, "mbox": "http://patches.dpdk.org/series/29547/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/131595/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/131595/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 62A1542600;\n\tTue, 19 Sep 2023 11:55:32 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 547514067A;\n\tTue, 19 Sep 2023 11:55:32 +0200 (CEST)", "from NAM02-SN1-obe.outbound.protection.outlook.com\n (mail-sn1nam02on2114.outbound.protection.outlook.com [40.107.96.114])\n by mails.dpdk.org (Postfix) with ESMTP id CD95B4026E\n for <dev@dpdk.org>; Tue, 19 Sep 2023 11:55:30 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by PH7PR13MB5868.namprd13.prod.outlook.com (2603:10b6:510:15a::6)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Tue, 19 Sep\n 2023 09:55:21 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::7a1c:2887:348a:84bd]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::7a1c:2887:348a:84bd%6]) with mapi id 15.20.6792.026; Tue, 19 Sep 2023\n 09:55:21 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=fiNVj9emLQps+Uu4yn5Sww4b9tEcwJ5QGWMW6SJBTiHl487iRp7xczOFwgdseuSbrCkR8kxMtzscx8uK8Ai479AzAyaEYOgkkl259ASXjbDpzvus/qWmNJe6Ywb3uoGtjOrOnJ/JsxZSnr8D7onqPRJBk+o9g6pNw2S7sqhOpC+PchesixQTQjs4OBaXr8UNBd8ToYgDgNFR5SvQK4CJHOZbSP47yknVNphPLXNzMhMKkjc7tqrlZti+uoqwIgkE/KePCSXhk4OqX9ElRtReMw8KNLPxKYJEUEOmmZcIq7opvZCMoAWo88X3C0kwV4cxVgOHQKDOCy/HzddSUa0nmw==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=PKYZeOr+rsDj+e/8DDLFfJa3LzaCABBUTTXTJfTPRh4=;\n b=Xt+XZlcP3Zu+ycu+MybhIrMdrip1//ASXRhEj4XnREDGVObh5e/S0PViM8Xukgltk3L6LMuY2UG/Ub93x7iib4AqMj6FRXw3WcBOqoKXuJXrJ1PcTA7uF8TtVcd05WYkguouJlbln2s7Ifw+7OnGvbDiz6L4Qc6iXfSjeTBZKyEkskDxiQHoHMngY6FP7QuYJ0oDOsoxMDfLwFuZYfzQk8A6jwtAutykyX9luQIkICGg5YquHSb92z+ik47+th+2bMk4NmWCSJyW1Pb7kMhGnXkbDKlYoZcTYp+DuYmDp2M6p8+UMBm/XiDzY2Iv7/g/G/+xJdBxBJlKxw/Otbmkww==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=PKYZeOr+rsDj+e/8DDLFfJa3LzaCABBUTTXTJfTPRh4=;\n b=rQwwhf/k6dIqhaYM9ALdosP/Ty0i5r4ErV1pDG55pfpuyxIXk0ko9P+dg1HTLH0dfRatM/qZ5VUVVC5wmNcuzT50YnNY6eVXPF1N9651JxM/F5WEI0CewwsmWxmFCRnuZzJz3kNT0wdVnVpJfsFDlUmfMOGgb3xKxj0MVk83luo=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "oss-drivers@corigine.com,\n\tChaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH v5 01/26] net/nfp: explicitly compare to null and 0", "Date": "Tue, 19 Sep 2023 17:54:15 +0800", "Message-Id": "<20230919095440.45445-2-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230919095440.45445-1-chaoyong.he@corigine.com>", "References": "<20230918024612.1600536-1-chaoyong.he@corigine.com>\n <20230919095440.45445-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "BY5PR04CA0014.namprd04.prod.outlook.com\n (2603:10b6:a03:1d0::24) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ0PR13MB5545:EE_|PH7PR13MB5868:EE_", "X-MS-Office365-Filtering-Correlation-Id": "7aa50e57-d969-4d89-d30e-08dbb8f68922", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n KdHF4nokYtUbC44s7RvPZUGbV4ZeG5lDo1AsKKo/PmkM2B8K7UCCIKlaP6ljBJZGoK7pCG/00FD6jDRHe4uHzXiRl9WAmIAZwVccYmIwbGLSfZJjfWqhsDnFFPoHvSXQxzzB+MaKhxf38t3CWTX2dbCyDOm2Pz4Ilx00cMEQr3qFlQvA6+2hQbVXaJ0OC1WqZK98UuCV0BgdkSSJ6+MGGyG/sV7+Huyg2c2ZJFF3GfKPRmzWvhaVctuejE/BzMhDPrqIvIyrrJRHzSC0LX4DEi7riI2YFZwfdrjhocv+ySD5aCPhH2p7mWZ/jh6RUCVKAUJ/Vp+RA8dQDPPt7itijKv0RZO9ZDL3vBT0swIodm6vQcLgSlSqdQ6TH0oSaPA//3fYF5sB7BbKFLU9PJ5KeurzQze7TUNWNLqZp/V/djceAW7s40FIU5eicl6BaUaLcRFjB200A7bnsVdBiEywVHrjapv+Q71cC8Qwqu1hWSzDaWQ+6rbfylkKWvNboiti840iFN5kA6/3HiQn5oJArg9P+7r3MdGMa/CSfAGITZu4+BGHQcaDtfQlrflFDDwOSGkfW537VoK3JsQ0GLBfNOVk9jsRP1wMiONJXGoxS1qjiy1cVNGXvqVgQQZ/fENuzmRhY4SSiOUhT/TjcoP5GXw/Q6VQ32KzxZrsik3/A+M=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230031)(136003)(39830400003)(366004)(346002)(376002)(396003)(1800799009)(186009)(451199024)(26005)(8936002)(2616005)(1076003)(8676002)(4326008)(107886003)(83380400001)(2906002)(30864003)(36756003)(44832011)(86362001)(52116002)(6506007)(6486002)(478600001)(5660300002)(6666004)(6916009)(316002)(6512007)(38100700002)(66946007)(66476007)(41300700001)(66556008)(38350700002);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n b0NpaXXxCVHxoMz0ax4JZKhVtWPrVYpb2bkkU8G3QWD9LilK0HvxkADhZpwcWcjX0hyzbUF1YTKJTSrFkBsowX+lf6MYu26QiL5iNNb7yPoufQnX24hHQohP3zaSaERceDS/hQuPiHijB6WGdFWD1ORY4CejYxJRAH2jo+qLEaFhP6g8KZBvVUgBoONpXUEUl39LE002XTSMf8LvUZr6yAiZ2sS1hcBl5GujXXWXwvUjwdAl0VqesOjRaJrQa9aQZZlp4xLKjoPCm/FEHn/RKm5iAUC4ufs/J9QkyjL1jRJFt+XsQNiyI1PNUm8OS6cK5IXBUDT+tpwi6tY82GvYERgfqcCN+mVXxSSN5kVguP7eP6MsXgKhQNo0Tzjv6cwJXI+rE8Vt5381R3sXFe+CIGxTAE62UMmJfDKJ5229HxWI7Dlrq13wy/3di2yVkBiYMw8kXmoYPe31xhqspm990PQ8FB3WpDAMLIvEuzubtKAMXsLX8mBWwrRTuZUFrArImw2ihj8hgSGKKd7axAA1Kq2X+Mb6ExRLTi1lXJOcElatLvL0oLOAID4QwfO4S+HE34rKFwuq1PmtrmrkZ/eZE3JgQw5vv+UHP8b/V0kvZ/BE8OGp9KA17p/6ZW2hfExjviiH6Xa0QUF1GXjZ2IhRMj4b4EuSBK+e1Qdek2lDHtxz0aEb6liSMMcQid79jtecr7lnHnbmpMwL16Sr2iKVYsPHk7mtnhXUHtpUIt1Cd5zPe5AGPe4gH3yS0ZLKS5ML3t/MLGlsH3XjJoPku6WTPPz2ELItNILdX0NboVozFOPRDKPOf/gMnZUMkYMVDd5H3vev66lCQ+MQPE9gGzavUo9C+Oz8qKhXwn34Fxu0yWS9J8pIMljbPopBlEfE/qWg7Hb6iglKNdBSYTD1L11OmIPOlNCzuV0d6VvN9UFEPpasD9iHmVFkaNDl0rOPCJ10aQwPDoEWd/ZlhfkHG+MM22+WJGQh2zfirjQgkv4Rv4GRzEcLzsAvh6CIXvDxE7eDdUc3Gzi1BqoS0iZ/A4WidE50eLfi1SLssOQRQHjkSORIYZnpie2dOWVF8L1TbJ2GTfyagFTxvCL5f39QsC0AjGeNQUAOQXMvF/f9jmHAc6Zwv8uCr65/DtJqEskXaTiUENMi+d35v3kHC3QExQfS+YT+vFTdFAtpdgTJtfMIJlzoC6NlsO+VkDIP3mbdYqETNDaieC8Q+zKiC+yyxxR9AWD4z4Bh9g/KVLlXEtjwsAsfYxuoxOscgH7pmOTt1shqRT9gGYWla8ZPzsOInja2X6S0rHIWWu2eJXYBC+X2EGh2DtRIza7clK0wzc1MlAZgzMWHl48YQk8L0cwfXflHC7vovEaCKSjY42Bw5H11TVaFdja/00a3V6REVauleYXPAQEE8TsoA82WUrQvA+Pbs2tF1GHZNfFZD6IFbBCgz+G35/JGg2Pklj7EQmbNoNBW1ODg9siBmqxIPeflvLW4y71iQrdzcPcucEZ6LLFdMkjM+D2zDe8BSZitcK0WNbUQ0THmSy+U7zhUB2RNEPMLIG359D0MMoKcheK8D+vbcWp/+icKZTxrcNMUJ6CEGJO6C0tkP+zFe20w2USD663b+A==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 7aa50e57-d969-4d89-d30e-08dbb8f68922", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "19 Sep 2023 09:55:21.3821 (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": "\n 433ec60pj2HCjNNMdXZOyyMXuP18Jy7c1GGeKEM1JEvNh89UkLi45gXp6Dmi95XBlJt8FG4ObeYHKLvW2S2mF97Api9mU2uI2RH0bZpagB8=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH7PR13MB5868", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "To compliance with the coding standard, make the pointer variable\nexplicitly comparing to 'NULL' and the integer variable explicitly\ncomparing to '0'.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\n---\n drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 12 ++++++------\n drivers/net/nfp/nfpcore/nfp_cppcore.c | 16 ++++++++--------\n drivers/net/nfp/nfpcore/nfp_hwinfo.c | 8 ++++----\n drivers/net/nfp/nfpcore/nfp_mip.c | 4 ++--\n drivers/net/nfp/nfpcore/nfp_mutex.c | 2 +-\n drivers/net/nfp/nfpcore/nfp_nffw.c | 4 ++--\n drivers/net/nfp/nfpcore/nfp_nsp.c | 20 ++++++++++----------\n drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 10 +++++-----\n drivers/net/nfp/nfpcore/nfp_resource.c | 6 +++---\n drivers/net/nfp/nfpcore/nfp_rtsym.c | 4 ++--\n 10 files changed, 43 insertions(+), 43 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\nindex 658c618ee6..2ee60eefc3 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n@@ -224,10 +224,10 @@ nfp_compute_bar(const struct nfp_bar *bar, uint32_t *bar_config,\n \n \tnewcfg |= offset >> bitsize;\n \n-\tif (bar_base)\n+\tif (bar_base != NULL)\n \t\t*bar_base = offset;\n \n-\tif (bar_config)\n+\tif (bar_config != NULL)\n \t\t*bar_config = newcfg;\n \n \treturn 0;\n@@ -266,7 +266,7 @@ nfp_reconfigure_bar(struct nfp_pcie_user *nfp, struct nfp_bar *bar, int tgt,\n \n \terr = nfp_compute_bar(bar, &newcfg, &newbase, tgt, act, tok, offset,\n \t\t\t size, width);\n-\tif (err)\n+\tif (err != 0)\n \t\treturn err;\n \n \tbar->base = newbase;\n@@ -515,7 +515,7 @@ nfp6000_area_read(struct nfp_cpp_area *area, void *kernel_vaddr,\n \t\treturn -EINVAL;\n \n \t/* Unaligned? Translate to an explicit access */\n-\tif ((priv->offset + offset) & (width - 1)) {\n+\tif (((priv->offset + offset) & (width - 1)) != 0) {\n \t\tPMD_DRV_LOG(ERR, \"aread_read unaligned!!!\");\n \t\treturn -EINVAL;\n \t}\n@@ -583,7 +583,7 @@ nfp6000_area_write(struct nfp_cpp_area *area, const void *kernel_vaddr,\n \t\treturn -EINVAL;\n \n \t/* Unaligned? Translate to an explicit access */\n-\tif ((priv->offset + offset) & (width - 1))\n+\tif (((priv->offset + offset) & (width - 1)) != 0)\n \t\treturn -EINVAL;\n \n \tis_64 = width == TARGET_WIDTH_64;\n@@ -764,7 +764,7 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev)\n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY &&\n \t cpp->driver_lock_needed) {\n \t\tret = nfp_acquire_process_lock(desc);\n-\t\tif (ret)\n+\t\tif (ret != 0)\n \t\t\tgoto error;\n \t}\n \ndiff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c\nindex 6daee313ce..31338e0047 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c\n@@ -235,7 +235,7 @@ nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp, uint32_t destination,\n \tif (area == NULL)\n \t\treturn NULL;\n \n-\tif (nfp_cpp_area_acquire(area)) {\n+\tif (nfp_cpp_area_acquire(area) != 0) {\n \t\tnfp_cpp_area_free(area);\n \t\treturn NULL;\n \t}\n@@ -252,7 +252,7 @@ nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp, uint32_t destination,\n void\n nfp_cpp_area_free(struct nfp_cpp_area *area)\n {\n-\tif (area->cpp->op->area_cleanup)\n+\tif (area->cpp->op->area_cleanup != NULL)\n \t\tarea->cpp->op->area_cleanup(area);\n \tfree(area);\n }\n@@ -280,7 +280,7 @@ nfp_cpp_area_release_free(struct nfp_cpp_area *area)\n int\n nfp_cpp_area_acquire(struct nfp_cpp_area *area)\n {\n-\tif (area->cpp->op->area_acquire) {\n+\tif (area->cpp->op->area_acquire != NULL) {\n \t\tint err = area->cpp->op->area_acquire(area);\n \n \t\tif (err < 0)\n@@ -299,7 +299,7 @@ nfp_cpp_area_acquire(struct nfp_cpp_area *area)\n void\n nfp_cpp_area_release(struct nfp_cpp_area *area)\n {\n-\tif (area->cpp->op->area_release)\n+\tif (area->cpp->op->area_release != NULL)\n \t\tarea->cpp->op->area_release(area);\n }\n \n@@ -319,7 +319,7 @@ nfp_cpp_area_iomem(struct nfp_cpp_area *area)\n {\n \tvoid *iomem = NULL;\n \n-\tif (area->cpp->op->area_iomem)\n+\tif (area->cpp->op->area_iomem != NULL)\n \t\tiomem = area->cpp->op->area_iomem(area);\n \n \treturn iomem;\n@@ -621,10 +621,10 @@ nfp_cpp_alloc(struct rte_pci_device *dev, int driver_lock_needed)\n void\n nfp_cpp_free(struct nfp_cpp *cpp)\n {\n-\tif (cpp->op && cpp->op->free)\n+\tif (cpp->op != NULL && cpp->op->free != NULL)\n \t\tcpp->op->free(cpp);\n \n-\tif (cpp->serial_len)\n+\tif (cpp->serial_len != 0)\n \t\tfree(cpp->serial);\n \n \tfree(cpp);\n@@ -833,7 +833,7 @@ __nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model)\n \t\treturn err;\n \n \t*model = reg & NFP_PL_DEVICE_MODEL_MASK;\n-\tif (*model & NFP_PL_DEVICE_ID_MASK)\n+\tif ((*model & NFP_PL_DEVICE_ID_MASK) != 0)\n \t\t*model -= 0x10;\n \n \treturn 0;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_hwinfo.c b/drivers/net/nfp/nfpcore/nfp_hwinfo.c\nindex 9054bb0315..a9d166c4dc 100644\n--- a/drivers/net/nfp/nfpcore/nfp_hwinfo.c\n+++ b/drivers/net/nfp/nfpcore/nfp_hwinfo.c\n@@ -37,7 +37,7 @@ nfp_hwinfo_db_walk(struct nfp_hwinfo *hwinfo, uint32_t size)\n {\n \tconst char *key, *val, *end = hwinfo->data + size;\n \n-\tfor (key = hwinfo->data; *key && key < end;\n+\tfor (key = hwinfo->data; *key != 0 && key < end;\n \t key = val + strlen(val) + 1) {\n \t\tval = key + strlen(key) + 1;\n \t\tif (val >= end) {\n@@ -141,7 +141,7 @@ nfp_hwinfo_fetch(struct nfp_cpp *cpp, size_t *hwdb_size)\n \n \tfor (;;) {\n \t\tdb = nfp_hwinfo_try_fetch(cpp, hwdb_size);\n-\t\tif (db)\n+\t\tif (db != NULL)\n \t\t\treturn db;\n \n \t\tnanosleep(&wait, NULL);\n@@ -164,7 +164,7 @@ nfp_hwinfo_read(struct nfp_cpp *cpp)\n \t\treturn NULL;\n \n \terr = nfp_hwinfo_db_validate(db, hwdb_size);\n-\tif (err) {\n+\tif (err != 0) {\n \t\tfree(db);\n \t\treturn NULL;\n \t}\n@@ -188,7 +188,7 @@ nfp_hwinfo_lookup(struct nfp_hwinfo *hwinfo, const char *lookup)\n \n \tend = hwinfo->data + hwinfo->size - sizeof(uint32_t);\n \n-\tfor (key = hwinfo->data; *key && key < end;\n+\tfor (key = hwinfo->data; *key != 0 && key < end;\n \t key = val + strlen(val) + 1) {\n \t\tval = key + strlen(key) + 1;\n \ndiff --git a/drivers/net/nfp/nfpcore/nfp_mip.c b/drivers/net/nfp/nfpcore/nfp_mip.c\nindex 6b392ad5eb..f9723dd136 100644\n--- a/drivers/net/nfp/nfpcore/nfp_mip.c\n+++ b/drivers/net/nfp/nfpcore/nfp_mip.c\n@@ -75,7 +75,7 @@ nfp_mip_read_resource(struct nfp_cpp *cpp, struct nfp_mip *mip)\n \t\treturn -ENODEV;\n \n \terr = nfp_nffw_info_mip_first(nffw_info, &cpp_id, &addr);\n-\tif (err)\n+\tif (err != 0)\n \t\tgoto exit_close_nffw;\n \n \terr = nfp_mip_try_read(cpp, cpp_id, addr, mip);\n@@ -105,7 +105,7 @@ nfp_mip_open(struct nfp_cpp *cpp)\n \t\treturn NULL;\n \n \terr = nfp_mip_read_resource(cpp, mip);\n-\tif (err) {\n+\tif (err != 0) {\n \t\tfree(mip);\n \t\treturn NULL;\n \t}\ndiff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c\nindex f967a29351..0410a00856 100644\n--- a/drivers/net/nfp/nfpcore/nfp_mutex.c\n+++ b/drivers/net/nfp/nfpcore/nfp_mutex.c\n@@ -38,7 +38,7 @@ static int\n _nfp_cpp_mutex_validate(uint32_t model, int *target, unsigned long long address)\n {\n \t/* Address must be 64-bit aligned */\n-\tif (address & 7)\n+\tif ((address & 7) != 0)\n \t\treturn -EINVAL;\n \n \tif (NFP_CPP_MODEL_IS_6000(model)) {\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c\nindex 07d63900dc..433780a5e7 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nffw.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nffw.c\n@@ -190,7 +190,7 @@ nfp_nffw_info_fwid_first(struct nfp_nffw_info *state)\n \t\treturn NULL;\n \n \tfor (i = 0; i < cnt; i++)\n-\t\tif (nffw_fwinfo_loaded_get(&fwinfo[i]))\n+\t\tif (nffw_fwinfo_loaded_get(&fwinfo[i]) != 0)\n \t\t\treturn &fwinfo[i];\n \n \treturn NULL;\n@@ -217,7 +217,7 @@ nfp_nffw_info_mip_first(struct nfp_nffw_info *state, uint32_t *cpp_id,\n \t*cpp_id = nffw_fwinfo_mip_cppid_get(fwinfo);\n \t*off = nffw_fwinfo_mip_offset_get(fwinfo);\n \n-\tif (nffw_fwinfo_mip_mu_da_get(fwinfo)) {\n+\tif (nffw_fwinfo_mip_mu_da_get(fwinfo) != 0) {\n \t\tint locality_off;\n \n \t\tif (NFP_CPP_ID_TARGET_of(*cpp_id) != NFP_CPP_TARGET_MU)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c\nindex 1f6b7bd85c..6474abf0c2 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp.c\n@@ -95,7 +95,7 @@ nfp_nsp_check(struct nfp_nsp *state)\n \t\treturn -EINVAL;\n \t}\n \n-\tif (reg & NSP_STATUS_BUSY) {\n+\tif ((reg & NSP_STATUS_BUSY) != 0) {\n \t\tPMD_DRV_LOG(ERR, \"Service processor busy!\");\n \t\treturn -EBUSY;\n \t}\n@@ -128,7 +128,7 @@ nfp_nsp_open(struct nfp_cpp *cpp)\n \tstate->res = res;\n \n \terr = nfp_nsp_check(state);\n-\tif (err) {\n+\tif (err != 0) {\n \t\tnfp_nsp_close(state);\n \t\treturn NULL;\n \t}\n@@ -219,7 +219,7 @@ nfp_nsp_command(struct nfp_nsp *state, uint16_t code, uint32_t option,\n \tnsp_buffer = nsp_base + NSP_BUFFER;\n \n \terr = nfp_nsp_check(state);\n-\tif (err)\n+\tif (err != 0)\n \t\treturn err;\n \n \tif (!FIELD_FIT(NSP_BUFFER_CPP, buff_cpp >> 8) ||\n@@ -245,7 +245,7 @@ nfp_nsp_command(struct nfp_nsp *state, uint16_t code, uint32_t option,\n \t/* Wait for NSP_COMMAND_START to go to 0 */\n \terr = nfp_nsp_wait_reg(cpp, ®, nsp_cpp, nsp_command,\n \t\t\t NSP_COMMAND_START, 0);\n-\tif (err) {\n+\tif (err != 0) {\n \t\tPMD_DRV_LOG(ERR, \"Error %d waiting for code 0x%04x to start\",\n \t\t\terr, code);\n \t\treturn err;\n@@ -254,7 +254,7 @@ nfp_nsp_command(struct nfp_nsp *state, uint16_t code, uint32_t option,\n \t/* Wait for NSP_STATUS_BUSY to go to 0 */\n \terr = nfp_nsp_wait_reg(cpp, ®, nsp_cpp, nsp_status, NSP_STATUS_BUSY,\n \t\t\t 0);\n-\tif (err) {\n+\tif (err != 0) {\n \t\tPMD_DRV_LOG(ERR, \"Error %d waiting for code 0x%04x to start\",\n \t\t\terr, code);\n \t\treturn err;\n@@ -266,7 +266,7 @@ nfp_nsp_command(struct nfp_nsp *state, uint16_t code, uint32_t option,\n \tret_val = FIELD_GET(NSP_COMMAND_OPTION, ret_val);\n \n \terr = FIELD_GET(NSP_STATUS_RESULT, reg);\n-\tif (err) {\n+\tif (err != 0) {\n \t\tPMD_DRV_LOG(ERR, \"Result (error) code set: %d (%d) command: %d\",\n \t\t\t -err, (int)ret_val, code);\n \t\tnfp_nsp_print_extended_error(ret_val);\n@@ -319,13 +319,13 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp, uint16_t code, uint32_t option,\n \tcpp_id = FIELD_GET(NSP_BUFFER_CPP, reg) << 8;\n \tcpp_buf = FIELD_GET(NSP_BUFFER_ADDRESS, reg);\n \n-\tif (in_buf && in_size) {\n+\tif (in_buf != NULL && in_size > 0) {\n \t\terr = nfp_cpp_write(cpp, cpp_id, cpp_buf, in_buf, in_size);\n \t\tif (err < 0)\n \t\t\treturn err;\n \t}\n \t/* Zero out remaining part of the buffer */\n-\tif (out_buf && out_size && out_size > in_size) {\n+\tif (out_buf != NULL && out_size > 0 && out_size > in_size) {\n \t\tmemset(out_buf, 0, out_size - in_size);\n \t\terr = nfp_cpp_write(cpp, cpp_id, cpp_buf + in_size, out_buf,\n \t\t\t\t out_size - in_size);\n@@ -337,7 +337,7 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp, uint16_t code, uint32_t option,\n \tif (ret < 0)\n \t\treturn ret;\n \n-\tif (out_buf && out_size) {\n+\tif (out_buf != NULL && out_size > 0) {\n \t\terr = nfp_cpp_read(cpp, cpp_id, cpp_buf, out_buf, out_size);\n \t\tif (err < 0)\n \t\t\treturn err;\n@@ -369,7 +369,7 @@ nfp_nsp_wait(struct nfp_nsp *state)\n \t\t\tbreak;\n \t\t}\n \t}\n-\tif (err)\n+\tif (err != 0)\n \t\tPMD_DRV_LOG(ERR, \"NSP failed to respond %d\", err);\n \n \treturn err;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\nindex 01b4652280..825a84a8cd 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n@@ -212,7 +212,7 @@ nfp_eth_port_translate(struct nfp_nsp *nsp, const union eth_table_entry *src,\n \tdst->fec_modes_supported |= fec << NFP_FEC_BASER_BIT;\n \tfec = FIELD_GET(NSP_ETH_PORT_FEC_SUPP_RS, port);\n \tdst->fec_modes_supported |= fec << NFP_FEC_REED_SOLOMON_BIT;\n-\tif (dst->fec_modes_supported)\n+\tif (dst->fec_modes_supported != 0)\n \t\tdst->fec_modes_supported |= NFP_FEC_AUTO | NFP_FEC_DISABLED;\n \n \tdst->fec = 1 << FIELD_GET(NSP_ETH_STATE_FEC, state);\n@@ -285,7 +285,7 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp)\n \t */\n \tfor (i = 0; i < NSP_ETH_MAX_COUNT; i++) {\n \t\tmac = (const struct rte_ether_addr *)entries[i].mac_addr;\n-\t\tif ((entries[i].port & NSP_ETH_PORT_LANES_MASK) &&\n+\t\tif ((entries[i].port & NSP_ETH_PORT_LANES_MASK) != 0 &&\n \t\t\t\t!rte_is_zero_ether_addr(mac))\n \t\t\tcnt++;\n \t}\n@@ -294,7 +294,7 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp)\n \t * those that give a port count, verify it against the value calculated\n \t * above.\n \t */\n-\tif (ret && ret != cnt) {\n+\tif (ret != 0 && ret != cnt) {\n \t\tPMD_DRV_LOG(ERR, \"table entry count (%d) unmatch entries present (%d)\",\n \t\t ret, cnt);\n \t\tgoto err;\n@@ -309,7 +309,7 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp)\n \ttable->count = cnt;\n \tfor (i = 0, j = 0; i < NSP_ETH_MAX_COUNT; i++) {\n \t\tmac = (const struct rte_ether_addr *)entries[i].mac_addr;\n-\t\tif ((entries[i].port & NSP_ETH_PORT_LANES_MASK) &&\n+\t\tif ((entries[i].port & NSP_ETH_PORT_LANES_MASK) != 0 &&\n \t\t\t\t!rte_is_zero_ether_addr(mac))\n \t\t\tnfp_eth_port_translate(nsp, &entries[i], i,\n \t\t\t\t\t&table->ports[j++]);\n@@ -621,7 +621,7 @@ nfp_eth_set_fec(struct nfp_cpp *cpp, unsigned int idx, enum nfp_eth_fec mode)\n \t\treturn -EIO;\n \n \terr = __nfp_eth_set_fec(nsp, mode);\n-\tif (err) {\n+\tif (err != 0) {\n \t\tnfp_eth_config_cleanup_end(nsp);\n \t\treturn err;\n \t}\ndiff --git a/drivers/net/nfp/nfpcore/nfp_resource.c b/drivers/net/nfp/nfpcore/nfp_resource.c\nindex 351bc623ed..838cd6e0ef 100644\n--- a/drivers/net/nfp/nfpcore/nfp_resource.c\n+++ b/drivers/net/nfp/nfpcore/nfp_resource.c\n@@ -115,15 +115,15 @@ nfp_resource_try_acquire(struct nfp_cpp *cpp, struct nfp_resource *res,\n {\n \tint err;\n \n-\tif (nfp_cpp_mutex_lock(dev_mutex))\n+\tif (nfp_cpp_mutex_lock(dev_mutex) != 0)\n \t\treturn -EINVAL;\n \n \terr = nfp_cpp_resource_find(cpp, res);\n-\tif (err)\n+\tif (err != 0)\n \t\tgoto err_unlock_dev;\n \n \terr = nfp_cpp_mutex_trylock(res->mutex);\n-\tif (err)\n+\tif (err != 0)\n \t\tgoto err_res_mutex_free;\n \n \tnfp_cpp_mutex_unlock(dev_mutex);\ndiff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c\nindex 343b0d0bcf..4c45aec5c1 100644\n--- a/drivers/net/nfp/nfpcore/nfp_rtsym.c\n+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c\n@@ -362,10 +362,10 @@ nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl, const char *name, int *error)\n \tif (err)\n \t\terr = -EIO;\n exit:\n-\tif (error)\n+\tif (error != NULL)\n \t\t*error = err;\n \n-\tif (err)\n+\tif (err != 0)\n \t\treturn ~0ULL;\n \n \treturn val;\n", "prefixes": [ "v5", "01/26" ] }