Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131608/?format=api
{ "id": 131608, "url": "http://patches.dpdk.org/api/patches/131608/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230919095440.45445-11-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-11-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230919095440.45445-11-chaoyong.he@corigine.com", "date": "2023-09-19T09:54:24", "name": "[v5,10/26] net/nfp: rename some parameter and variable", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "7b1364e53c1568bbf337b035a1a5410a2d1e3658", "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-11-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/131608/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/131608/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 23BD942600;\n\tTue, 19 Sep 2023 11:57:15 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 2698540EE3;\n\tTue, 19 Sep 2023 11:56:01 +0200 (CEST)", "from NAM02-SN1-obe.outbound.protection.outlook.com\n (mail-sn1nam02on2100.outbound.protection.outlook.com [40.107.96.100])\n by mails.dpdk.org (Postfix) with ESMTP id 697BF40E68\n for <dev@dpdk.org>; Tue, 19 Sep 2023 11:55:55 +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:37 +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:37 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=IcxrKaaLk4PIjr2eTQA2WHGgteGdE3+FjNhOkOyL7u6VFcpEf6B/3qczYQgim7oKGjV7QZs4I7XPleTRU78MW5GqkbDWuYcXHuyYip0oipeHiFnq8A/Ixcd3jxCer89k5zemABFaL6LPofevn6epjwOuKWaTrUJt1RB4aDYnGirvB9JanzpPkpNhJyCHtPwxMnvpFIod8S+1vJDS4ZYxnCiYr02Y9jxQs9LsH+wvvGE9fMqbhU9XGXk/aOkJhsaACekzXmGdjJeyD0KGMDOLTwkWipMvKL/9G+7TXCH6h4Ekqju3S1Si7IkCudiR4dzm2twMk4479+3IYNBldyXm+g==", "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=HS92lopuFl05hpwprcr0sy/5k4bpgIVvPHgXt/SXanU=;\n b=gZd1GqcxHWp21tNZ/FCj6emSEG010q+fJbiAn0so8vpuh/0EYnLtp2565mLlGrMy/3KOZruh0dsxqTILe5dtIZEzqVe1GUooZSUGPMFDq1hFhbUfiKNViet9ogmijhBmYZEUAnZ2Ac17I3xPDj8LMJP5DtKEZwZnQfJgxtOdRo61g63jrY5NDfGluV4G8gREe/EyA9Xlw3Xis0i7gfZkai1WZbmv1vzwX1lwerPPH3qaEZh7Qb8nBol7fBDxCcMqH+mRN5S1WxcfHz6s0qWGV9JpMCxUP3vuEljsOhcfJiUgkcVQIjRZQs58/0ju5QPdASYuOSPKgykzTW0E6pL04A==", "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=HS92lopuFl05hpwprcr0sy/5k4bpgIVvPHgXt/SXanU=;\n b=as44BiWyiQRteY0z3uJxxsJ+1UI2TYZ2wXX/AQd2ZhIodKYP7a5PdjFYLLSBfTpNUmGyqFq3T/l+PwX0qtr8uF8ucA+DhJdzinpZqIStgfXxu1BL17uxbDDW9myrWIyB1DSFdrhGxGAiarn5ymqsBaVWediJcBKIsAEBDiSvB34=", "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 10/26] net/nfp: rename some parameter and variable", "Date": "Tue, 19 Sep 2023 17:54:24 +0800", "Message-Id": "<20230919095440.45445-11-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": "99f710c9-6c09-4c18-dbe8-08dbb8f6932e", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n ZeQw6pIWVn0dr8VRbvrcN4ydZLI+2ZtwkipPhAJzAHnjK7FGR8dTtyel91XL/tXkL5t/P+45DOBLI0EE62tcU7gxlQbM6TecR6kW8b3cqxXG3nCTpp3dg5kYSXJk78vB9HprUubs5Ql3iM43EsFnrGZIUoQiL2UWqQ6EI/z8YXrTJMzaLxkd4s0vePPnxGWIJmtv1qooTjSDTkXJyBt+9yFuVir7rYtFSzVBihIC0pOrj4Z5BpRbvdZ3aiEIxPx+eYXgetuHdwGPGkDN8ydL20pL3cC418gplSANa5tmr2p/6Oeu7Fv6FjpDSEESW8mWIZBPMeASNGSsd3ygSwfnFMeVFKabDGVTSbCSCkDEW4m/PO+x9wyJ28ao9ivOCFFw/N7M9rXvR/tV67I/ecOynr0of9nGY92cqKgGuU9LwmDfCD6VdvKtbE7U+pMHVypajvolitz+lt+/YxhpoU7qtl0W6CewkpJ/S4Yq3vUx1L+iCV4JHUXTPRzD8+4Hc4k+m5ZqRafu0T7R7UTxs45pDCcpyp5x8Z09J+KigOvRN2f7/MbVeW8qYQndKJ3N+vFr3MeuzySIl5vTXZA2+E5UM/+dOw+mfEx42v20PH37cJERMcatWX3aF/IbUMW4dL2lI5Wn4mrq9R46DzIteQnfEIQJ60RWQ1LFfBGvGuQbWvU=", "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 jPNQsLF5NVPQ3DCIznEoGOcFu8b9lsA0nBBtT8ZCrj2OSSKunx2NaqlTzMv8G32HiJpH7haLibAY+BR1g0tezxaOzibuwhWartMSMJRYMHfQ0zpfiq27ITz01MoqgSkjU3pp6yGB8rA3qlnPn6V0ENajZs0zPLQRFuPNGlWycrebA3qWGxN8dD6Fr19qh5l0mOQBBNq1f8cgWjZ21A1k82v48zL4VtLDOq8b1uf1cNcWPUg0inOzw9pcROmetXh352wnjJ+VzQ528IGneDYfX5MErdLIeLFp8eD4S6PoOA0anY7lIIGYPjP0O3sAMWncOM2UJf9Tc0DRFCiX68cXsPESeKCCCP0ktTjrVQnYVCsNVE4LcQpnt0BljvDyPstdJg7Y3nmp2eZ/1PU3qJIcAP+5vT1fKaBRmINgl7+VoZrfXz+Ox6vRLd4cfrX6aCIZdiMb9LKDXCmawqQRHA6B0bb51iPUK2Gs4/YmBkYgHw5XkoV9wt/6nHtEOC9sWMrASmE+xTGwfoiHEgBKL+rl5D8Fjxjs/8YwTdSoEdViMZtm7ydF/LrB5KkzINZkMRItHkbukYfG+MllCf0zgIKWzA1euq5wn5D0DK6YkGVWG5s+njvtor2+pMRyVt/v8pQHzv3bHlx8qDJ/F5cIz+F5Mi0m1Tcrb6AJvkrekteeyU+cTYW+3jtPbxQvbOi2GdqPCgbIdqU6dn4i7JbRGjiiWPbW/dwHx7qL8EFg5poQjAhKg8ClGVAHx0Zb8mzKRTMbqemtOVssXhsv5dhsdZbc6ILUbdCT3ti8v5Xwk1R1u+Xwd6fcw61lVQUSHpzTNmVUrJydlmPCvRb/+pfqj/pVyABiTziFoyh0n+lz2H8KnDxEZbUPv7kBOFbBz2tDbYv4gLGd2Xdg373rZxw6SdqXNtUJ3IWS+RTYW/uIltT/GhF4Ru5sqeXun84HCD0hWsVtl++AlROywtyQkMxLzjaIFfd1w+5O58IioaL0JKtxr4RVzNkEG9sTeoCrSq3seL4aXZW6fEXrAujMZHR0MRdoyatKqWRaFRrAB19dPRSoFdTEQmh98ByriTpmGaaypam8fg3Wtq5OUERMQPIfBKrEhmCZF6T43sPKaFKOpsE33hJJDaCWghhyHRJ7YN+zA7zVfgQg4Rnx+4tDzh+ISgkF09QSJ/c+rARgona9NUvU7x0HQ1JCiQ/pwNTka5dI351KjjQtmLuljZAVy22o1Ezwf/DBOBiUzHj0mA/03JSVgNbhL9D8L5vnVutJ2QTjqOKWIwY9zFrCOQsqon5rQk9E3l8WH/2gJ3HKUgmDc7BBArKeDFcLHKyqPsa/Fth1bB80iw5gFVgL2j/N2xzGaXewIz/262p5eYkXZyPovVah+9WAZJskT4PHpT5V0N9/ktMJ0KbuV7RVXhHdoQFv027+3+4J1U4xmVQ4dCWXa7hdOf8RXSGIWASB1SjHu0+AJMRKD3JEVScwoVpZPAjOyZmG2LzfrtP0fu8HIzmY3XI2BAGfOibimBLooh9xXEQgRpa1ICE5jE3aoE/lIcW2I6sHqj9eaYhqNb/gwc6k7vlSBhON+nFgCJYOv0OToFrWBHGn3DtxXRljWGV0K9Xrk0LWNg==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 99f710c9-6c09-4c18-dbe8-08dbb8f6932e", "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:37.6691 (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 iY7jl+8jLeGPGsUn6sn7Wgk17sNG3L/Wh+UUCIcR8yshvissM911IVN993N/pv0rx9113YOWt4Vfef32Wn9czkIBvvpk05v3g+UxzXG+AMk=", "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": "Rename some parameter and variable to make the logic easier to\nunderstand.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\n---\n drivers/net/nfp/nfpcore/nfp_cpp.h | 10 ++---\n drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 42 ++++++++---------\n drivers/net/nfp/nfpcore/nfp_cppcore.c | 52 +++++++++++-----------\n drivers/net/nfp/nfpcore/nfp_mip.h | 2 +-\n drivers/net/nfp/nfpcore/nfp_mutex.c | 6 +--\n drivers/net/nfp/nfpcore/nfp_nffw.c | 20 ++++-----\n drivers/net/nfp/nfpcore/nfp_nffw.h | 4 +-\n drivers/net/nfp/nfpcore/nfp_nsp.h | 8 ++--\n drivers/net/nfp/nfpcore/nfp_nsp_cmds.c | 2 +-\n drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 20 ++++-----\n 10 files changed, 83 insertions(+), 83 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h\nindex ceb4d56a08..be7ae1d919 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp.h\n@@ -247,7 +247,7 @@ void *nfp_cpp_priv(struct nfp_cpp *cpp);\n \n void *nfp_cpp_area_priv(struct nfp_cpp_area *cpp_area);\n \n-uint32_t __nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model);\n+uint32_t nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model);\n \n /* NFP CPP core interface for CPP clients */\n struct nfp_cpp *nfp_cpp_from_device_name(struct rte_pci_device *dev,\n@@ -381,10 +381,10 @@ uint8_t *nfp_cpp_map_area(struct nfp_cpp *cpp, uint32_t cpp_id,\n \t\tuint64_t addr, uint32_t size, struct nfp_cpp_area **area);\n \n int nfp_cpp_area_read(struct nfp_cpp_area *area, uint32_t offset,\n-\t\tvoid *buffer, size_t length);\n+\t\tvoid *address, size_t length);\n \n int nfp_cpp_area_write(struct nfp_cpp_area *area, uint32_t offset,\n-\t\tconst void *buffer, size_t length);\n+\t\tconst void *address, size_t length);\n \n void *nfp_cpp_area_iomem(struct nfp_cpp_area *area);\n \n@@ -393,10 +393,10 @@ struct nfp_cpp *nfp_cpp_area_cpp(struct nfp_cpp_area *cpp_area);\n const char *nfp_cpp_area_name(struct nfp_cpp_area *cpp_area);\n \n int nfp_cpp_read(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\tuint64_t address, void *kernel_vaddr, size_t length);\n+\t\tuint64_t address, void *buf, size_t length);\n \n int nfp_cpp_write(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\tuint64_t address, const void *kernel_vaddr, size_t length);\n+\t\tuint64_t address, const void *buf, size_t length);\n \n int nfp_cpp_area_readl(struct nfp_cpp_area *area, uint32_t offset,\n \t\tuint32_t *value);\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\nindex 28a6278497..db15411eb2 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n@@ -118,9 +118,9 @@ static int\n nfp_compute_bar(const struct nfp_bar *bar,\n \t\tuint32_t *bar_config,\n \t\tuint64_t *bar_base,\n-\t\tint tgt,\n-\t\tint act,\n-\t\tint tok,\n+\t\tint target,\n+\t\tint action,\n+\t\tint token,\n \t\tuint64_t offset,\n \t\tsize_t size,\n \t\tint width)\n@@ -129,7 +129,7 @@ nfp_compute_bar(const struct nfp_bar *bar,\n \tuint32_t newcfg;\n \tuint32_t bitsize;\n \n-\tif (tgt >= 16)\n+\tif (target >= 16)\n \t\treturn -EINVAL;\n \n \tswitch (width) {\n@@ -149,15 +149,15 @@ nfp_compute_bar(const struct nfp_bar *bar,\n \t\treturn -EINVAL;\n \t}\n \n-\tif (act != NFP_CPP_ACTION_RW && act != 0) {\n+\tif (action != NFP_CPP_ACTION_RW && action != 0) {\n \t\t/* Fixed CPP mapping with specific action */\n \t\tmask = ~(NFP_PCIE_P2C_FIXED_SIZE(bar) - 1);\n \n \t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_MAPTYPE\n \t\t\t\t(NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_FIXED);\n-\t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_TARGET_BASEADDRESS(tgt);\n-\t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_ACTION_BASEADDRESS(act);\n-\t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS(tok);\n+\t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_TARGET_BASEADDRESS(target);\n+\t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_ACTION_BASEADDRESS(action);\n+\t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS(token);\n \n \t\tif ((offset & mask) != ((offset + size - 1) & mask))\n \t\t\treturn -EINVAL;\n@@ -170,8 +170,8 @@ nfp_compute_bar(const struct nfp_bar *bar,\n \t\t/* Bulk mapping */\n \t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_MAPTYPE\n \t\t\t\t(NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_BULK);\n-\t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_TARGET_BASEADDRESS(tgt);\n-\t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS(tok);\n+\t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_TARGET_BASEADDRESS(target);\n+\t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS(token);\n \n \t\tif ((offset & mask) != ((offset + size - 1) & mask))\n \t\t\treturn -EINVAL;\n@@ -221,9 +221,9 @@ nfp_bar_write(struct nfp_pcie_user *nfp,\n static int\n nfp_reconfigure_bar(struct nfp_pcie_user *nfp,\n \t\tstruct nfp_bar *bar,\n-\t\tint tgt,\n-\t\tint act,\n-\t\tint tok,\n+\t\tint target,\n+\t\tint action,\n+\t\tint token,\n \t\tuint64_t offset,\n \t\tsize_t size,\n \t\tint width)\n@@ -232,8 +232,8 @@ nfp_reconfigure_bar(struct nfp_pcie_user *nfp,\n \tuint32_t newcfg;\n \tuint64_t newbase;\n \n-\terr = nfp_compute_bar(bar, &newcfg, &newbase, tgt, act, tok, offset,\n-\t\t\tsize, width);\n+\terr = nfp_compute_bar(bar, &newcfg, &newbase, target, action,\n+\t\t\ttoken, offset, size, width);\n \tif (err != 0)\n \t\treturn err;\n \n@@ -457,15 +457,15 @@ nfp6000_area_iomem(struct nfp_cpp_area *area)\n \n static int\n nfp6000_area_read(struct nfp_cpp_area *area,\n-\t\tvoid *kernel_vaddr,\n+\t\tvoid *address,\n \t\tuint32_t offset,\n \t\tsize_t length)\n {\n \tsize_t n;\n \tint width;\n \tbool is_64;\n-\tuint32_t *wrptr32 = kernel_vaddr;\n-\tuint64_t *wrptr64 = kernel_vaddr;\n+\tuint32_t *wrptr32 = address;\n+\tuint64_t *wrptr64 = address;\n \tstruct nfp6000_area_priv *priv;\n \tconst volatile uint32_t *rdptr32;\n \tconst volatile uint64_t *rdptr64;\n@@ -526,7 +526,7 @@ nfp6000_area_read(struct nfp_cpp_area *area,\n \n static int\n nfp6000_area_write(struct nfp_cpp_area *area,\n-\t\tconst void *kernel_vaddr,\n+\t\tconst void *address,\n \t\tuint32_t offset,\n \t\tsize_t length)\n {\n@@ -536,8 +536,8 @@ nfp6000_area_write(struct nfp_cpp_area *area,\n \tuint32_t *wrptr32;\n \tuint64_t *wrptr64;\n \tstruct nfp6000_area_priv *priv;\n-\tconst uint32_t *rdptr32 = kernel_vaddr;\n-\tconst uint64_t *rdptr64 = kernel_vaddr;\n+\tconst uint32_t *rdptr32 = address;\n+\tconst uint64_t *rdptr64 = address;\n \n \tpriv = nfp_cpp_area_priv(area);\n \twrptr64 = (uint64_t *)(priv->iomem + offset);\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c\nindex c46fd62e32..7173b4d8a5 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c\n@@ -90,7 +90,7 @@ nfp_cpp_model(struct nfp_cpp *cpp)\n \tif (cpp == NULL)\n \t\treturn NFP_CPP_MODEL_INVALID;\n \n-\terr = __nfp_cpp_model_autodetect(cpp, &model);\n+\terr = nfp_cpp_model_autodetect(cpp, &model);\n \n \tif (err < 0)\n \t\treturn err;\n@@ -484,7 +484,7 @@ nfp_cpp_area_iomem(struct nfp_cpp_area *area)\n * CPP area handle\n * @param offset\n * Offset into CPP area\n- * @param kernel_vaddr\n+ * @param address\n * Address to put data into\n * @param length\n * Number of bytes to read\n@@ -498,13 +498,13 @@ nfp_cpp_area_iomem(struct nfp_cpp_area *area)\n int\n nfp_cpp_area_read(struct nfp_cpp_area *area,\n \t\tuint32_t offset,\n-\t\tvoid *kernel_vaddr,\n+\t\tvoid *address,\n \t\tsize_t length)\n {\n \tif ((offset + length) > area->size)\n \t\treturn -EFAULT;\n \n-\treturn area->cpp->op->area_read(area, kernel_vaddr, offset, length);\n+\treturn area->cpp->op->area_read(area, address, offset, length);\n }\n \n /**\n@@ -514,7 +514,7 @@ nfp_cpp_area_read(struct nfp_cpp_area *area,\n * CPP area handle\n * @param offset\n * Offset into CPP area\n- * @param kernel_vaddr\n+ * @param address\n * Address to put data into\n * @param length\n * Number of bytes to read\n@@ -528,13 +528,13 @@ nfp_cpp_area_read(struct nfp_cpp_area *area,\n int\n nfp_cpp_area_write(struct nfp_cpp_area *area,\n \t\tuint32_t offset,\n-\t\tconst void *kernel_vaddr,\n+\t\tconst void *address,\n \t\tsize_t length)\n {\n \tif ((offset + length) > area->size)\n \t\treturn -EFAULT;\n \n-\treturn area->cpp->op->area_write(area, kernel_vaddr, offset, length);\n+\treturn area->cpp->op->area_write(area, address, offset, length);\n }\n \n /*\n@@ -880,14 +880,14 @@ nfp_cpp_alloc(struct rte_pci_device *dev,\n \t}\n \n \tif (NFP_CPP_MODEL_IS_6000(nfp_cpp_model(cpp))) {\n-\t\tuint32_t xpbaddr;\n-\t\tsize_t tgt;\n+\t\tuint32_t xpb_addr;\n+\t\tsize_t target;\n \n-\t\tfor (tgt = 0; tgt < RTE_DIM(cpp->imb_cat_table); tgt++) {\n+\t\tfor (target = 0; target < RTE_DIM(cpp->imb_cat_table); target++) {\n \t\t\t/* Hardcoded XPB IMB Base, island 0 */\n-\t\t\txpbaddr = 0x000a0000 + (tgt * 4);\n-\t\t\terr = nfp_xpb_readl(cpp, xpbaddr,\n-\t\t\t\t\t(uint32_t *)&cpp->imb_cat_table[tgt]);\n+\t\t\txpb_addr = 0x000a0000 + (target * 4);\n+\t\t\terr = nfp_xpb_readl(cpp, xpb_addr,\n+\t\t\t\t\t(uint32_t *)&cpp->imb_cat_table[target]);\n \t\t\tif (err < 0) {\n \t\t\t\tfree(cpp);\n \t\t\t\treturn NULL;\n@@ -950,9 +950,9 @@ nfp_cpp_from_device_name(struct rte_pci_device *dev,\n * CPP handle\n * @param destination\n * CPP id\n- * @param address\n+ * @param offset\n * Offset into CPP target\n- * @param kernel_vaddr\n+ * @param address\n * Buffer for result\n * @param length\n * Number of bytes to read\n@@ -963,20 +963,20 @@ nfp_cpp_from_device_name(struct rte_pci_device *dev,\n int\n nfp_cpp_read(struct nfp_cpp *cpp,\n \t\tuint32_t destination,\n-\t\tuint64_t address,\n-\t\tvoid *kernel_vaddr,\n+\t\tuint64_t offset,\n+\t\tvoid *address,\n \t\tsize_t length)\n {\n \tint err;\n \tstruct nfp_cpp_area *area;\n \n-\tarea = nfp_cpp_area_alloc_acquire(cpp, destination, address, length);\n+\tarea = nfp_cpp_area_alloc_acquire(cpp, destination, offset, length);\n \tif (area == NULL) {\n \t\tPMD_DRV_LOG(ERR, \"Area allocation/acquire failed for read\");\n \t\treturn -1;\n \t}\n \n-\terr = nfp_cpp_area_read(area, 0, kernel_vaddr, length);\n+\terr = nfp_cpp_area_read(area, 0, address, length);\n \n \tnfp_cpp_area_release_free(area);\n \treturn err;\n@@ -989,9 +989,9 @@ nfp_cpp_read(struct nfp_cpp *cpp,\n * CPP handle\n * @param destination\n * CPP id\n- * @param address\n+ * @param offset\n * Offset into CPP target\n- * @param kernel_vaddr\n+ * @param address\n * Buffer to read from\n * @param length\n * Number of bytes to write\n@@ -1002,20 +1002,20 @@ nfp_cpp_read(struct nfp_cpp *cpp,\n int\n nfp_cpp_write(struct nfp_cpp *cpp,\n \t\tuint32_t destination,\n-\t\tuint64_t address,\n-\t\tconst void *kernel_vaddr,\n+\t\tuint64_t offset,\n+\t\tconst void *address,\n \t\tsize_t length)\n {\n \tint err;\n \tstruct nfp_cpp_area *area;\n \n-\tarea = nfp_cpp_area_alloc_acquire(cpp, destination, address, length);\n+\tarea = nfp_cpp_area_alloc_acquire(cpp, destination, offset, length);\n \tif (area == NULL) {\n \t\tPMD_DRV_LOG(ERR, \"Area allocation/acquire failed for write\");\n \t\treturn -1;\n \t}\n \n-\terr = nfp_cpp_area_write(area, 0, kernel_vaddr, length);\n+\terr = nfp_cpp_area_write(area, 0, address, length);\n \n \tnfp_cpp_area_release_free(area);\n \treturn err;\n@@ -1026,7 +1026,7 @@ nfp_cpp_write(struct nfp_cpp *cpp,\n * as those are model-specific\n */\n uint32_t\n-__nfp_cpp_model_autodetect(struct nfp_cpp *cpp,\n+nfp_cpp_model_autodetect(struct nfp_cpp *cpp,\n \t\tuint32_t *model)\n {\n \tint err;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_mip.h b/drivers/net/nfp/nfpcore/nfp_mip.h\nindex 371c635b97..7fa09ee575 100644\n--- a/drivers/net/nfp/nfpcore/nfp_mip.h\n+++ b/drivers/net/nfp/nfpcore/nfp_mip.h\n@@ -17,6 +17,6 @@ const char *nfp_mip_name(const struct nfp_mip *mip);\n void nfp_mip_symtab(const struct nfp_mip *mip, uint32_t *addr, uint32_t *size);\n void nfp_mip_strtab(const struct nfp_mip *mip, uint32_t *addr, uint32_t *size);\n int nfp_nffw_info_mip_first(struct nfp_nffw_info *state, uint32_t *cpp_id,\n-\t\tuint64_t *off);\n+\t\tuint64_t *offset);\n \n #endif /* __NFP_MIP_H__ */\ndiff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c\nindex e97537b795..82598be7a1 100644\n--- a/drivers/net/nfp/nfpcore/nfp_mutex.c\n+++ b/drivers/net/nfp/nfpcore/nfp_mutex.c\n@@ -35,7 +35,7 @@ struct nfp_cpp_mutex {\n };\n \n static int\n-_nfp_cpp_mutex_validate(uint32_t model,\n+nfp_cpp_mutex_validate(uint32_t model,\n \t\tint *target,\n \t\tuint64_t address)\n {\n@@ -87,7 +87,7 @@ nfp_cpp_mutex_init(struct nfp_cpp *cpp,\n \tuint32_t model = nfp_cpp_model(cpp);\n \tuint32_t muw = NFP_CPP_ID(target, 4, 0); /* atomic_write */\n \n-\terr = _nfp_cpp_mutex_validate(model, &target, address);\n+\terr = nfp_cpp_mutex_validate(model, &target, address);\n \tif (err < 0)\n \t\treturn err;\n \n@@ -152,7 +152,7 @@ nfp_cpp_mutex_alloc(struct nfp_cpp *cpp,\n \t\treturn NULL;\n \t}\n \n-\terr = _nfp_cpp_mutex_validate(model, &target, address);\n+\terr = nfp_cpp_mutex_validate(model, &target, address);\n \tif (err < 0)\n \t\treturn NULL;\n \ndiff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c\nindex be80eeaa0e..df6292e909 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nffw.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nffw.c\n@@ -31,11 +31,11 @@ nffw_res_flg_init_get(const struct nfp_nffw_info_data *res)\n \treturn (res->flags[0] >> 0) & 1;\n }\n \n-/* loaded = loaded__mu_da__mip_off_hi<31:31> */\n+/* loaded = loaded_mu_da_mip_off_hi<31:31> */\n static uint32_t\n nffw_fwinfo_loaded_get(const struct nffw_fwinfo *fi)\n {\n-\treturn (fi->loaded__mu_da__mip_off_hi >> 31) & 1;\n+\treturn (fi->loaded_mu_da_mip_off_hi >> 31) & 1;\n }\n \n /* mip_cppid = mip_cppid */\n@@ -45,18 +45,18 @@ nffw_fwinfo_mip_cppid_get(const struct nffw_fwinfo *fi)\n \treturn fi->mip_cppid;\n }\n \n-/* loaded = loaded__mu_da__mip_off_hi<8:8> */\n+/* loaded = loaded_mu_da_mip_off_hi<8:8> */\n static uint32_t\n nffw_fwinfo_mip_mu_da_get(const struct nffw_fwinfo *fi)\n {\n-\treturn (fi->loaded__mu_da__mip_off_hi >> 8) & 1;\n+\treturn (fi->loaded_mu_da_mip_off_hi >> 8) & 1;\n }\n \n-/* mip_offset = (loaded__mu_da__mip_off_hi<7:0> << 32) | mip_offset_lo */\n+/* mip_offset = (loaded_mu_da_mip_off_hi<7:0> << 32) | mip_offset_lo */\n static uint64_t\n nffw_fwinfo_mip_offset_get(const struct nffw_fwinfo *fi)\n {\n-\tuint64_t mip_off_hi = fi->loaded__mu_da__mip_off_hi;\n+\tuint64_t mip_off_hi = fi->loaded_mu_da_mip_off_hi;\n \n \treturn (mip_off_hi & 0xFF) << 32 | fi->mip_offset_lo;\n }\n@@ -227,7 +227,7 @@ nfp_nffw_info_fwid_first(struct nfp_nffw_info *state)\n int\n nfp_nffw_info_mip_first(struct nfp_nffw_info *state,\n \t\tuint32_t *cpp_id,\n-\t\tuint64_t *off)\n+\t\tuint64_t *offset)\n {\n \tstruct nffw_fwinfo *fwinfo;\n \n@@ -236,7 +236,7 @@ nfp_nffw_info_mip_first(struct nfp_nffw_info *state,\n \t\treturn -EINVAL;\n \n \t*cpp_id = nffw_fwinfo_mip_cppid_get(fwinfo);\n-\t*off = nffw_fwinfo_mip_offset_get(fwinfo);\n+\t*offset = nffw_fwinfo_mip_offset_get(fwinfo);\n \n \tif (nffw_fwinfo_mip_mu_da_get(fwinfo) != 0) {\n \t\tint locality_off;\n@@ -248,8 +248,8 @@ nfp_nffw_info_mip_first(struct nfp_nffw_info *state,\n \t\tif (locality_off < 0)\n \t\t\treturn locality_off;\n \n-\t\t*off &= ~(NFP_MU_ADDR_ACCESS_TYPE_MASK << locality_off);\n-\t\t*off |= NFP_MU_ADDR_ACCESS_TYPE_DIRECT << locality_off;\n+\t\t*offset &= ~(NFP_MU_ADDR_ACCESS_TYPE_MASK << locality_off);\n+\t\t*offset |= NFP_MU_ADDR_ACCESS_TYPE_DIRECT << locality_off;\n \t}\n \n \treturn 0;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nffw.h b/drivers/net/nfp/nfpcore/nfp_nffw.h\nindex f84be463c4..52e25c090a 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nffw.h\n+++ b/drivers/net/nfp/nfpcore/nfp_nffw.h\n@@ -38,11 +38,11 @@\n \n /* nfp.nffw meinfo */\n struct nffw_meinfo {\n-\tuint32_t ctxmask__fwid__meid;\n+\tuint32_t ctxmask_fwid_meid;\n };\n \n struct nffw_fwinfo {\n-\tuint32_t loaded__mu_da__mip_off_hi;\n+\tuint32_t loaded_mu_da_mip_off_hi;\n \tuint32_t mip_cppid; /* 0 means no MIP */\n \tuint32_t mip_offset_lo;\n };\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp.h b/drivers/net/nfp/nfpcore/nfp_nsp.h\nindex 7bf584dcd0..705574b900 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp.h\n@@ -231,9 +231,9 @@ struct nfp_nsp *nfp_eth_config_start(struct nfp_cpp *cpp, uint32_t idx);\n int nfp_eth_config_commit_end(struct nfp_nsp *nsp);\n void nfp_eth_config_cleanup_end(struct nfp_nsp *nsp);\n \n-int __nfp_eth_set_aneg(struct nfp_nsp *nsp, enum nfp_eth_aneg mode);\n-int __nfp_eth_set_speed(struct nfp_nsp *nsp, uint32_t speed);\n-int __nfp_eth_set_split(struct nfp_nsp *nsp, uint32_t lanes);\n+int nfp_eth_set_aneg(struct nfp_nsp *nsp, enum nfp_eth_aneg mode);\n+int nfp_eth_set_speed(struct nfp_nsp *nsp, uint32_t speed);\n+int nfp_eth_set_split(struct nfp_nsp *nsp, uint32_t lanes);\n \n /* NSP static information */\n struct nfp_nsp_identify {\n@@ -248,7 +248,7 @@ struct nfp_nsp_identify {\n \tuint64_t sensor_mask; /**< Mask of present sensors available on NIC */\n };\n \n-struct nfp_nsp_identify *__nfp_nsp_identify(struct nfp_nsp *nsp);\n+struct nfp_nsp_identify *nfp_nsp_identify(struct nfp_nsp *nsp);\n \n enum nfp_nsp_sensor_id {\n \tNFP_SENSOR_CHIP_TEMPERATURE,\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\nindex 769ed54957..f656f200f4 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\n@@ -24,7 +24,7 @@ struct nsp_identify {\n };\n \n struct nfp_nsp_identify *\n-__nfp_nsp_identify(struct nfp_nsp *nsp)\n+nfp_nsp_identify(struct nfp_nsp *nsp)\n {\n \tint ret;\n \tstruct nsp_identify *ni;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\nindex d291552d03..32c1838a40 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n@@ -242,7 +242,7 @@ nfp_eth_calc_port_type(struct nfp_eth_table_port *entry)\n }\n \n static struct nfp_eth_table *\n-__nfp_eth_read_ports(struct nfp_nsp *nsp)\n+nfp_eth_read_ports_real(struct nfp_nsp *nsp)\n {\n \tint ret;\n \tuint32_t i;\n@@ -335,7 +335,7 @@ nfp_eth_read_ports(struct nfp_cpp *cpp)\n \tif (nsp == NULL)\n \t\treturn NULL;\n \n-\tret = __nfp_eth_read_ports(nsp);\n+\tret = nfp_eth_read_ports_real(nsp);\n \tnfp_nsp_close(nsp);\n \n \treturn ret;\n@@ -484,7 +484,7 @@ nfp_eth_set_mod_enable(struct nfp_cpp *cpp,\n int\n nfp_eth_set_configured(struct nfp_cpp *cpp,\n \t\tuint32_t idx,\n-\t\tint configed)\n+\t\tint configured)\n {\n \tuint64_t reg;\n \tstruct nfp_nsp *nsp;\n@@ -507,10 +507,10 @@ nfp_eth_set_configured(struct nfp_cpp *cpp,\n \n \t/* Check if we are already in requested state */\n \treg = rte_le_to_cpu_64(entries[idx].state);\n-\tif (configed != (int)FIELD_GET(NSP_ETH_STATE_CONFIGURED, reg)) {\n+\tif (configured != (int)FIELD_GET(NSP_ETH_STATE_CONFIGURED, reg)) {\n \t\treg = rte_le_to_cpu_64(entries[idx].control);\n \t\treg &= ~NSP_ETH_CTRL_CONFIGURED;\n-\t\treg |= FIELD_PREP(NSP_ETH_CTRL_CONFIGURED, configed);\n+\t\treg |= FIELD_PREP(NSP_ETH_CTRL_CONFIGURED, configured);\n \t\tentries[idx].control = rte_cpu_to_le_64(reg);\n \n \t\tnfp_nsp_config_set_modified(nsp, 1);\n@@ -576,7 +576,7 @@ nfp_eth_set_bit_config(struct nfp_nsp *nsp,\n * 0 or -ERRNO\n */\n int\n-__nfp_eth_set_aneg(struct nfp_nsp *nsp,\n+nfp_eth_set_aneg(struct nfp_nsp *nsp,\n \t\tenum nfp_eth_aneg mode)\n {\n \treturn NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_STATE,\n@@ -596,7 +596,7 @@ __nfp_eth_set_aneg(struct nfp_nsp *nsp,\n * 0 or -ERRNO\n */\n static int\n-__nfp_eth_set_fec(struct nfp_nsp *nsp,\n+nfp_eth_set_fec_real(struct nfp_nsp *nsp,\n \t\tenum nfp_eth_fec mode)\n {\n \treturn NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_STATE,\n@@ -630,7 +630,7 @@ nfp_eth_set_fec(struct nfp_cpp *cpp,\n \tif (nsp == NULL)\n \t\treturn -EIO;\n \n-\terr = __nfp_eth_set_fec(nsp, mode);\n+\terr = nfp_eth_set_fec_real(nsp, mode);\n \tif (err != 0) {\n \t\tnfp_eth_config_cleanup_end(nsp);\n \t\treturn err;\n@@ -654,7 +654,7 @@ nfp_eth_set_fec(struct nfp_cpp *cpp,\n * 0 or -ERRNO\n */\n int\n-__nfp_eth_set_speed(struct nfp_nsp *nsp,\n+nfp_eth_set_speed(struct nfp_nsp *nsp,\n \t\tuint32_t speed)\n {\n \tenum nfp_eth_rate rate;\n@@ -682,7 +682,7 @@ __nfp_eth_set_speed(struct nfp_nsp *nsp,\n * 0 or -ERRNO\n */\n int\n-__nfp_eth_set_split(struct nfp_nsp *nsp,\n+nfp_eth_set_split(struct nfp_nsp *nsp,\n \t\tuint32_t lanes)\n {\n \treturn NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_PORT,\n", "prefixes": [ "v5", "10/26" ] }