Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/130843/?format=api
{ "id": 130843, "url": "http://patchwork.dpdk.org/api/patches/130843/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230830021457.2064750-6-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20230830021457.2064750-6-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230830021457.2064750-6-chaoyong.he@corigine.com", "date": "2023-08-30T02:14:35", "name": "[v2,05/27] net/nfp: standard the local variable coding style", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ffc31e5dd0c33dc5bbd452d41c73dcd4b5c6f54a", "submitter": { "id": 2554, "url": "http://patchwork.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230830021457.2064750-6-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29363, "url": "http://patchwork.dpdk.org/api/series/29363/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29363", "date": "2023-08-30T02:14:30", "name": "refact the nfpcore module", "version": 2, "mbox": "http://patchwork.dpdk.org/series/29363/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/130843/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/130843/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 9588141FC8;\n\tWed, 30 Aug 2023 04:16:14 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 97AFB4029D;\n\tWed, 30 Aug 2023 04:15:36 +0200 (CEST)", "from NAM12-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam12on2109.outbound.protection.outlook.com [40.107.243.109])\n by mails.dpdk.org (Postfix) with ESMTP id 2EF0F4027A\n for <dev@dpdk.org>; Wed, 30 Aug 2023 04:15:35 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by SJ0PR13MB5548.namprd13.prod.outlook.com (2603:10b6:a03:421::5)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34; Wed, 30 Aug\n 2023 02:15:32 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::c0f3:c2cc:b5bb:4192]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::c0f3:c2cc:b5bb:4192%4]) with mapi id 15.20.6699.034; Wed, 30 Aug 2023\n 02:15:32 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=mFAdHUlboo/MrMyqZAhV1DcVAEFmma+zU9L6kfIyPtvayLM88wHRSUtUNaQcgR9eAO/eUbtUJOPvXXtbLdHW1kszaMqDhR0iHgMjq+OWzj2uB/YrEtC+HfbbfmJcMtlOaEr6xS4t521LXZQaKWKACPAtACJGe+hywf62Z9Dk05fgqK0Qv+qJmHZOlp+ZxfAP2pjRjYoqZlFhxD03sC64XjfP11CTK1bH2lj1wJ1Vi4NxqRs8mzDEpKj6YzsbzbBJj2aDw3wPNJyQBD3w2KCEW/XLJAnboEF6MPWOU6OoQSv50MHTXmZZFQxTGzPLyvS2ZNUqy8xlHHoQxqDU4tQPfw==", "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=v2oqJz3y0dSBWJsvc+AHWxcVJSzAakYhluAE4prPiBo=;\n b=eMbWVbdD8LlWPYab8nvWB7+9soT92OVkFX4DpIiLUb80B9Je+VZ0ZH+7nmb6CQYlDYtGids6ep9KLkPih/9O8szVCAc3uhIkJkwC7O/BokN7w8DtDSuIY2koAuO+6CWxGcNtDQd9x3NApdqRwB9ca8cs8mtRisfJvoFmby1oDn1+duHQb34bvoXjUNC86LmLLPFccLZ1yFScKcla5duGnyIM5kqUJGagyC9NnUzsoQgWgDxHfeoSap86n+bh3om/9saVHAmwkZ6pR+60QsZnmCqT380iTJm2I/zYZWG4M0r1pC7Cg8URsnPdyUAbxnrWxlapkmNaFZhfF1rgqDIxZw==", "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=v2oqJz3y0dSBWJsvc+AHWxcVJSzAakYhluAE4prPiBo=;\n b=GOh41fFsUtInfgvxMqdlMYpbbvVvCu40bGV20kvlUgqPChNpoAcm8xdJ5Bjk6uGg9IxpCE0Yu/DzNQ2VHolK0c6hk6m3EQORiUZRsNPzdmhd7ctW248AsqazgrEnWWcuoXGF/IecpFStvYPltr4nvHwRU1McA3E8VZOSvQ7v0Qo=", "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, niklas.soderlund@corigine.com,\n Chaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH v2 05/27] net/nfp: standard the local variable coding style", "Date": "Wed, 30 Aug 2023 10:14:35 +0800", "Message-Id": "<20230830021457.2064750-6-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>\n <20230830021457.2064750-1-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "PH0PR07CA0113.namprd07.prod.outlook.com\n (2603:10b6:510:4::28) 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_|SJ0PR13MB5548:EE_", "X-MS-Office365-Filtering-Correlation-Id": "6aa82dd0-23c3-482f-3b06-08dba8fefcba", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n zfR1JJoMOXmWYzUe0R+cQ4uXMNBGKSxem1fkNU76suRFvppaG5lL/ERynJ8oe+atfM82Z1EPZB+CFsBRqssmuykSF84JeMcC7JrzQc/DbpOJix2xDT3einrA05YJw5n8W7Er/Vn3Eh4+jRPafe+OHGBnAFraVspR2jrLl5+akqvDdRqd4vA6joEI+zocB2gVxmJZvrYrwqI4i6M/73pQkzkyTFn9EDYCB/jCypLiGh18irLjQs1ywKT68aNLFL8WjTahps+Id43WaTsxF05OSqGRg8cQpISxwe7qrDgfy6k/n09UOiwEz9JR0vKmiJJGZZXzv4oCTcxzCGKXu0BB2aehuQ/p1jST6J5A8COnHf+rCrbwNUJU+1XuF2DNmr0CgXd+VmrA+uQPF/uu2cj0cy0dJQcNqbo4o6dMudc58u9FvPPN+YbNTW9ZT8X4MmmyfeA2CuaA6JZuHGmGSU55H8CiO30hNgianw3PpAzxnMi3Xxgmtga/jku/SKJa/iwrBkErXRtP943UOQccqm1NcJhIydGunvOlNgUuXK3SLt+2di59m9iKnK/1DnL7M2X6OwZDFMjwQW+cDeTEwVBW1rRNpQewCEgVVPs1sGSiIYyPdZuLtVjVVEp4MXzkKTRVY5iXjvwUdJaKV+j2UV+wnvBSCcoO9LlnAPEqQMVKtAc=", "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)(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);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?5VqbEafLqLPn9Q01cBAxlMnMjzTI?=\n\t=?utf-8?q?NqkExg1UTQ3eKTZf0wmo1U1rageolWoynI/3+QQEDRknGA/nmgaU5WwdFBzu7T1eb?=\n\t=?utf-8?q?FyIft0sSyhw3ibDl2T1VhX9gY8ynlRmZAt77cdUkQ38OzgQz54mK9F2+91/sCDHE4?=\n\t=?utf-8?q?BpYqriNmqzC3BYk02Kw6WgzpwSYTaoOgvnMiET1wqw9Tvhuz6MEtihNVFyQeuTvEm?=\n\t=?utf-8?q?Gi2F5BM7F2T3GQyTIIYzQ+mEELWhpwFPnKgKBwuf2yEFXt6myIJ08GKeGNfx4RaFh?=\n\t=?utf-8?q?5fko+B+r3kOyx5JG0271eDPG00YiDJG9+503NCC5uNlfyajYsIrZYpX6Db56QvL9N?=\n\t=?utf-8?q?ycGcagZjsYNmaUq3VnV/ixI9byyObNQAq0MLG/cIuNjHFjcICcXjR/luYwVCsATgu?=\n\t=?utf-8?q?YNdlJqNruy8mu/u4afmEnf0/6VJEaycloDYwgv42lqPwIhXKVmY+Qfh9f5a9v7XjS?=\n\t=?utf-8?q?TFm/+9Y+ww1M1w/5gj4MHo77R7w6Wgw1ETOS5J6TCBwjzpnCc/Cklmot/VkLCEvjJ?=\n\t=?utf-8?q?F26SXwodZDLEDewy36oYijJ7lBg6eJoGQ6CobCCcDY7e9auLiW0P7CsMk3BPYrhgH?=\n\t=?utf-8?q?+TLyljuxa1Q8Ixm9Mwzm4wbADNsaJ/qm0wV1x0q+XgqgrvaWTmdc8YnTwymyqRUsx?=\n\t=?utf-8?q?XZa8Ixkl5YMOoOmq2t0d8QmoJ0fB7hyI2MKAzcy+VW6XwL7yphuREjJDic0UNyaEP?=\n\t=?utf-8?q?IWejPNBD7xFbZmjEg++GyxP6Rydhgg7YdfsHEWzMgfwOdOlzrt1DO+h6lukNE6hxK?=\n\t=?utf-8?q?WzhsG4XIaTclG3K0/BngrlRfPvWem+GgU1UAlOj21l0ucmnmDoVNNi/Z+tHo/dVVn?=\n\t=?utf-8?q?/xMqGeWrlNZjXJF1xv6cWikfLMVi6sl1iSN7+IfoF9hBxWVHNW33rBrihBVw0vTgn?=\n\t=?utf-8?q?9m/E0GVQ13e04Tdcn0zMGz0rvtqDgARV7/g2Cyj3Q2l9SAUYgPX5BCiJY9v6JxhPb?=\n\t=?utf-8?q?sDCaLFA0wERKh58bBPj3MTtE+SYJGm4sUlVGuRdGXmZRmzuv7hJ+2CFsDW/z8HUdn?=\n\t=?utf-8?q?4OpcTul8Z1F+/SXdT0pLf3taOoWt7/49B3mks8Q7jwrUjjOr43Za82kvjKkcxSUK0?=\n\t=?utf-8?q?wUO7cfNZji9sGZf+nKG/+TISi/t2Xiwy8p862nYIqksm8KmdKZt0bP0mMfUhSQd2x?=\n\t=?utf-8?q?V9TeTUM//0fudyYbjMZmBR8nB1kD0azappUXvgxn6agZXzqmucP3/63KSYzBxJvMX?=\n\t=?utf-8?q?Xisok0o0yDOVCxziLDJxPVI9UIYR6X4fet1A9WoiCTLYRXTdX/IbuJZ8h9MR4dPhf?=\n\t=?utf-8?q?Szzv88IBfb2PI6L0NUCwlZVV+zgiuypdzwl52wr5R5TgmWexSamhl/tquKjvQ1QCK?=\n\t=?utf-8?q?a7a1UO3ZvpXcLDRWuda6DLvwaYOGddHk+vn569oATRGKo4Fjec98AYvB+MuLjMPbl?=\n\t=?utf-8?q?8z6YBMN/vn2eHUqj6FM/hgnMSb1DAyQAfLgwajjywPmqv4ZL2YGvkcRR1ENQ41biX?=\n\t=?utf-8?q?iR3gdjPOVN5uQTVYk9b3S2Vl61K6LHmZ5l1r1nsa8PmMlEZONTfJoVKnnL0F3bsRH?=\n\t=?utf-8?q?aJdc1zaUSPdf2rh9HxFDkQKAI7iYAMQacA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 6aa82dd0-23c3-482f-3b06-08dba8fefcba", "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:32.4084 (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 6x8qDxCh6Xnv0nSfpEgXwWE20XS+v6QfqlGaV+aDTPdBluT9CuipaPbaOCykNi9t/m1apH0/N6/PyIiv2jdInrM4Q61xPiIQUyWPjvlLPTs=", "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 <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": "There should only declare one local variable in each line, and the local\nvariable should be arranged from short to long in the function.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 58 ++++++++++++----------\n drivers/net/nfp/nfpcore/nfp_cppcore.c | 14 +++---\n drivers/net/nfp/nfpcore/nfp_hwinfo.c | 27 ++++++----\n drivers/net/nfp/nfpcore/nfp_mip.c | 8 +--\n drivers/net/nfp/nfpcore/nfp_mutex.c | 25 ++++++----\n drivers/net/nfp/nfpcore/nfp_nffw.c | 15 +++---\n drivers/net/nfp/nfpcore/nfp_nsp.c | 40 ++++++++-------\n drivers/net/nfp/nfpcore/nfp_nsp_cmds.c | 8 +--\n drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 39 ++++++++-------\n drivers/net/nfp/nfpcore/nfp_resource.c | 15 +++---\n drivers/net/nfp/nfpcore/nfp_rtsym.c | 19 ++++---\n 11 files changed, 151 insertions(+), 117 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 ec14ec45dc..78beee07ef 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n@@ -140,9 +140,9 @@ nfp_compute_bar(const struct nfp_bar *bar,\n \t\tsize_t size,\n \t\tint width)\n {\n-\tuint32_t bitsize;\n-\tuint32_t newcfg;\n \tuint64_t mask;\n+\tuint32_t newcfg;\n+\tuint32_t bitsize;\n \n \tif (tgt >= 16)\n \t\treturn -EINVAL;\n@@ -239,7 +239,8 @@ nfp_bar_write(struct nfp_pcie_user *nfp,\n \t\tstruct nfp_bar *bar,\n \t\tuint32_t newcfg)\n {\n-\tint base, slot;\n+\tint base;\n+\tint slot;\n \n \tbase = bar->index >> 3;\n \tslot = bar->index & 7;\n@@ -268,9 +269,9 @@ nfp_reconfigure_bar(struct nfp_pcie_user *nfp,\n \t\tsize_t size,\n \t\tint width)\n {\n-\tuint64_t newbase;\n-\tuint32_t newcfg;\n \tint err;\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@@ -303,8 +304,10 @@ nfp_reconfigure_bar(struct nfp_pcie_user *nfp,\n static int\n nfp_enable_bars(struct nfp_pcie_user *nfp)\n {\n+\tint x;\n+\tint end;\n+\tint start;\n \tstruct nfp_bar *bar;\n-\tint x, start, end;\n \n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n \t\tstart = NFP_BAR_MID;\n@@ -333,8 +336,10 @@ nfp_enable_bars(struct nfp_pcie_user *nfp)\n static struct nfp_bar *\n nfp_alloc_bar(struct nfp_pcie_user *nfp)\n {\n+\tint x;\n+\tint end;\n+\tint start;\n \tstruct nfp_bar *bar;\n-\tint x, start, end;\n \n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n \t\tstart = NFP_BAR_MID;\n@@ -356,8 +361,10 @@ nfp_alloc_bar(struct nfp_pcie_user *nfp)\n static void\n nfp_disable_bars(struct nfp_pcie_user *nfp)\n {\n+\tint x;\n+\tint end;\n+\tint start;\n \tstruct nfp_bar *bar;\n-\tint x, start, end;\n \n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n \t\tstart = NFP_BAR_MID;\n@@ -403,12 +410,13 @@ nfp6000_area_init(struct nfp_cpp_area *area,\n \t\tuint64_t address,\n \t\tsize_t size)\n {\n-\tstruct nfp_pcie_user *nfp = nfp_cpp_priv(nfp_cpp_area_cpp(area));\n-\tstruct nfp6000_area_priv *priv = nfp_cpp_area_priv(area);\n+\tint pp;\n+\tint ret = 0;\n+\tuint32_t token = NFP_CPP_ID_TOKEN_of(dest);\n \tuint32_t target = NFP_CPP_ID_TARGET_of(dest);\n \tuint32_t action = NFP_CPP_ID_ACTION_of(dest);\n-\tuint32_t token = NFP_CPP_ID_TOKEN_of(dest);\n-\tint pp, ret = 0;\n+\tstruct nfp6000_area_priv *priv = nfp_cpp_area_priv(area);\n+\tstruct nfp_pcie_user *nfp = nfp_cpp_priv(nfp_cpp_area_cpp(area));\n \n \tpp = nfp_target_pushpull(NFP_CPP_ID(target, action, token), address);\n \tif (pp < 0)\n@@ -493,14 +501,14 @@ nfp6000_area_read(struct nfp_cpp_area *area,\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-\tconst volatile uint64_t *rdptr64;\n \tstruct nfp6000_area_priv *priv;\n-\tuint32_t *wrptr32 = kernel_vaddr;\n \tconst volatile uint32_t *rdptr32;\n-\tint width;\n-\tsize_t n;\n-\tbool is_64;\n+\tconst volatile uint64_t *rdptr64;\n \n \tpriv = nfp_cpp_area_priv(area);\n \trdptr64 = (uint64_t *)(priv->iomem + offset);\n@@ -563,14 +571,14 @@ nfp6000_area_write(struct nfp_cpp_area *area,\n \t\tuint32_t offset,\n \t\tsize_t length)\n {\n-\tconst uint64_t *rdptr64 = kernel_vaddr;\n-\tuint64_t *wrptr64;\n-\tconst uint32_t *rdptr32 = kernel_vaddr;\n-\tstruct nfp6000_area_priv *priv;\n-\tuint32_t *wrptr32;\n-\tint width;\n \tsize_t n;\n+\tint width;\n \tbool is_64;\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 \n \tpriv = nfp_cpp_area_priv(area);\n \twrptr64 = (uint64_t *)(priv->iomem + offset);\n@@ -693,10 +701,10 @@ static int\n nfp6000_set_serial(struct rte_pci_device *dev,\n \t\tstruct nfp_cpp *cpp)\n {\n+\toff_t pos;\n \tuint16_t tmp;\n \tuint8_t serial[6];\n \tint serial_len = 6;\n-\toff_t pos;\n \n \tpos = rte_pci_find_ext_capability(dev, RTE_PCI_EXT_CAP_ID_DSN);\n \tif (pos <= 0) {\n@@ -741,8 +749,8 @@ static int\n nfp6000_set_barsz(struct rte_pci_device *dev,\n \t\tstruct nfp_pcie_user *desc)\n {\n-\tuint64_t tmp;\n \tint i = 0;\n+\tuint64_t tmp;\n \n \ttmp = dev->mem_resource[0].len;\n \ndiff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c\nindex f885e7d8ff..776842bdf6 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c\n@@ -172,9 +172,9 @@ nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp,\n \t\tuint64_t address,\n \t\tuint32_t size)\n {\n+\tint err;\n \tstruct nfp_cpp_area *area;\n \tuint64_t tmp64 = (uint64_t)address;\n-\tint err;\n \n \tif (cpp == NULL)\n \t\treturn NULL;\n@@ -396,8 +396,8 @@ static uint32_t\n nfp_xpb_to_cpp(struct nfp_cpp *cpp,\n \t\tuint32_t *xpb_addr)\n {\n-\tuint32_t xpb;\n \tint island;\n+\tuint32_t xpb;\n \n \txpb = NFP_CPP_ID(14, NFP_CPP_ACTION_RW, 0);\n \n@@ -569,9 +569,9 @@ static struct nfp_cpp *\n nfp_cpp_alloc(struct rte_pci_device *dev,\n \t\tint driver_lock_needed)\n {\n-\tconst struct nfp_cpp_operations *ops;\n-\tstruct nfp_cpp *cpp;\n \tint err;\n+\tstruct nfp_cpp *cpp;\n+\tconst struct nfp_cpp_operations *ops;\n \n \tops = nfp_cpp_transport_operations();\n \n@@ -657,8 +657,8 @@ nfp_cpp_read(struct nfp_cpp *cpp,\n \t\tvoid *kernel_vaddr,\n \t\tsize_t length)\n {\n-\tstruct nfp_cpp_area *area;\n \tint err;\n+\tstruct nfp_cpp_area *area;\n \n \tarea = nfp_cpp_area_alloc_acquire(cpp, destination, address, length);\n \tif (area == NULL) {\n@@ -687,8 +687,8 @@ nfp_cpp_write(struct nfp_cpp *cpp,\n \t\tconst void *kernel_vaddr,\n \t\tsize_t length)\n {\n-\tstruct nfp_cpp_area *area;\n \tint err;\n+\tstruct nfp_cpp_area *area;\n \n \tarea = nfp_cpp_area_alloc_acquire(cpp, destination, address, length);\n \tif (area == NULL)\n@@ -708,8 +708,8 @@ uint32_t\n __nfp_cpp_model_autodetect(struct nfp_cpp *cpp,\n \t\tuint32_t *model)\n {\n-\tuint32_t reg;\n \tint err;\n+\tuint32_t reg;\n \n \terr = nfp_xpb_readl(cpp, NFP_XPB_DEVICE(1, 1, 16) + NFP_PL_DEVICE_ID,\n \t\t\t®);\ndiff --git a/drivers/net/nfp/nfpcore/nfp_hwinfo.c b/drivers/net/nfp/nfpcore/nfp_hwinfo.c\nindex ea4c7d6a9e..819761eda0 100644\n--- a/drivers/net/nfp/nfpcore/nfp_hwinfo.c\n+++ b/drivers/net/nfp/nfpcore/nfp_hwinfo.c\n@@ -36,7 +36,9 @@ static int\n nfp_hwinfo_db_walk(struct nfp_hwinfo *hwinfo,\n \t\tuint32_t size)\n {\n-\tconst char *key, *val, *end = hwinfo->data + size;\n+\tconst char *key;\n+\tconst char *val;\n+\tconst char *end = hwinfo->data + size;\n \n \tfor (key = hwinfo->data; *key != 0 && key < end;\n \t\t\tkey = val + strlen(val) + 1) {\n@@ -58,7 +60,9 @@ static int\n nfp_hwinfo_db_validate(struct nfp_hwinfo *db,\n \t\tuint32_t len)\n {\n-\tuint32_t size, new_crc, *crc;\n+\tuint32_t *crc;\n+\tuint32_t size;\n+\tuint32_t new_crc;\n \n \tsize = db->size;\n \tif (size > len) {\n@@ -82,12 +86,12 @@ static struct nfp_hwinfo *\n nfp_hwinfo_try_fetch(struct nfp_cpp *cpp,\n \t\tsize_t *cpp_size)\n {\n-\tstruct nfp_hwinfo *header;\n-\tvoid *res;\n-\tuint64_t cpp_addr;\n-\tuint32_t cpp_id;\n \tint err;\n+\tvoid *res;\n \tuint8_t *db;\n+\tuint32_t cpp_id;\n+\tuint64_t cpp_addr;\n+\tstruct nfp_hwinfo *header;\n \n \tres = nfp_resource_acquire(cpp, NFP_RESOURCE_NFP_HWINFO);\n \tif (res) {\n@@ -135,13 +139,12 @@ static struct nfp_hwinfo *\n nfp_hwinfo_fetch(struct nfp_cpp *cpp,\n \t\tsize_t *hwdb_size)\n {\n+\tint count = 0;\n \tstruct timespec wait;\n \tstruct nfp_hwinfo *db;\n-\tint count;\n \n \twait.tv_sec = 0;\n \twait.tv_nsec = 10000000;\n-\tcount = 0;\n \n \tfor (;;) {\n \t\tdb = nfp_hwinfo_try_fetch(cpp, hwdb_size);\n@@ -159,9 +162,9 @@ nfp_hwinfo_fetch(struct nfp_cpp *cpp,\n struct nfp_hwinfo *\n nfp_hwinfo_read(struct nfp_cpp *cpp)\n {\n-\tstruct nfp_hwinfo *db;\n-\tsize_t hwdb_size = 0;\n \tint err;\n+\tsize_t hwdb_size = 0;\n+\tstruct nfp_hwinfo *db;\n \n \tdb = nfp_hwinfo_fetch(cpp, &hwdb_size);\n \tif (db == NULL)\n@@ -186,7 +189,9 @@ const char *\n nfp_hwinfo_lookup(struct nfp_hwinfo *hwinfo,\n \t\tconst char *lookup)\n {\n-\tconst char *key, *val, *end;\n+\tconst char *key;\n+\tconst char *val;\n+\tconst char *end;\n \n \tif (hwinfo == NULL || lookup == NULL)\n \t\treturn NULL;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_mip.c b/drivers/net/nfp/nfpcore/nfp_mip.c\nindex 0071d3fc37..1e601313b4 100644\n--- a/drivers/net/nfp/nfpcore/nfp_mip.c\n+++ b/drivers/net/nfp/nfpcore/nfp_mip.c\n@@ -68,10 +68,10 @@ static int\n nfp_mip_read_resource(struct nfp_cpp *cpp,\n \t\tstruct nfp_mip *mip)\n {\n-\tstruct nfp_nffw_info *nffw_info;\n-\tuint32_t cpp_id;\n-\tuint64_t addr;\n \tint err;\n+\tuint64_t addr;\n+\tuint32_t cpp_id;\n+\tstruct nfp_nffw_info *nffw_info;\n \n \tnffw_info = nfp_nffw_info_open(cpp);\n \tif (nffw_info == NULL)\n@@ -100,8 +100,8 @@ nfp_mip_read_resource(struct nfp_cpp *cpp,\n struct nfp_mip *\n nfp_mip_open(struct nfp_cpp *cpp)\n {\n-\tstruct nfp_mip *mip;\n \tint err;\n+\tstruct nfp_mip *mip;\n \n \tmip = malloc(sizeof(*mip));\n \tif (mip == NULL)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c\nindex 4d26e6f052..05e0ff46e5 100644\n--- a/drivers/net/nfp/nfpcore/nfp_mutex.c\n+++ b/drivers/net/nfp/nfpcore/nfp_mutex.c\n@@ -79,9 +79,9 @@ nfp_cpp_mutex_init(struct nfp_cpp *cpp,\n \t\tuint64_t address,\n \t\tuint32_t key)\n {\n+\tint err;\n \tuint32_t model = nfp_cpp_model(cpp);\n \tuint32_t muw = NFP_CPP_ID(target, 4, 0);\t/* atomic_write */\n-\tint err;\n \n \terr = _nfp_cpp_mutex_validate(model, &target, address);\n \tif (err < 0)\n@@ -122,11 +122,11 @@ nfp_cpp_mutex_alloc(struct nfp_cpp *cpp,\n \t\tuint64_t address,\n \t\tuint32_t key)\n {\n-\tuint32_t model = nfp_cpp_model(cpp);\n-\tstruct nfp_cpp_mutex *mutex;\n-\tuint32_t mur = NFP_CPP_ID(target, 3, 0);\t/* atomic_read */\n \tint err;\n \tuint32_t tmp;\n+\tstruct nfp_cpp_mutex *mutex;\n+\tuint32_t model = nfp_cpp_model(cpp);\n+\tuint32_t mur = NFP_CPP_ID(target, 3, 0);\t/* atomic_read */\n \n \t/* Look for cached mutex */\n \tfor (mutex = cpp->mutex_cache; mutex; mutex = mutex->next) {\n@@ -241,12 +241,13 @@ nfp_cpp_mutex_lock(struct nfp_cpp_mutex *mutex)\n int\n nfp_cpp_mutex_unlock(struct nfp_cpp_mutex *mutex)\n {\n-\tuint32_t muw = NFP_CPP_ID(mutex->target, 4, 0);\t/* atomic_write */\n-\tuint32_t mur = NFP_CPP_ID(mutex->target, 3, 0);\t/* atomic_read */\n+\tint err;\n+\tuint32_t key;\n+\tuint32_t value;\n \tstruct nfp_cpp *cpp = mutex->cpp;\n-\tuint32_t key, value;\n \tuint16_t interface = nfp_cpp_interface(cpp);\n-\tint err;\n+\tuint32_t muw = NFP_CPP_ID(mutex->target, 4, 0);\t/* atomic_write */\n+\tuint32_t mur = NFP_CPP_ID(mutex->target, 3, 0);\t/* atomic_read */\n \n \tif (mutex->depth > 1) {\n \t\tmutex->depth--;\n@@ -295,12 +296,14 @@ nfp_cpp_mutex_unlock(struct nfp_cpp_mutex *mutex)\n int\n nfp_cpp_mutex_trylock(struct nfp_cpp_mutex *mutex)\n {\n+\tint err;\n+\tuint32_t key;\n+\tuint32_t tmp;\n+\tuint32_t value;\n+\tstruct nfp_cpp *cpp = mutex->cpp;\n \tuint32_t mur = NFP_CPP_ID(mutex->target, 3, 0);\t/* atomic_read */\n \tuint32_t muw = NFP_CPP_ID(mutex->target, 4, 0);\t/* atomic_write */\n \tuint32_t mus = NFP_CPP_ID(mutex->target, 5, 3);\t/* test_set_imm */\n-\tuint32_t key, value, tmp;\n-\tstruct nfp_cpp *cpp = mutex->cpp;\n-\tint err;\n \n \tif (mutex->depth > 0) {\n \t\tif (mutex->depth == MUTEX_DEPTH_MAX)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c\nindex 7ff468373b..32e0fc94bb 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nffw.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nffw.c\n@@ -68,9 +68,11 @@ nffw_fwinfo_mip_offset_get(const struct nffw_fwinfo *fi)\n static int\n nfp_mip_mu_locality_lsb(struct nfp_cpp *cpp)\n {\n-\tuint32_t mode, addr40;\n-\tuint32_t xpbaddr, imbcppat;\n \tint err;\n+\tuint32_t mode;\n+\tuint32_t addr40;\n+\tuint32_t xpbaddr;\n+\tuint32_t imbcppat;\n \n \t/* Hardcoded XPB IMB Base, island 0 */\n \txpbaddr = 0x000a0000 + NFP_CPP_TARGET_MU * 4;\n@@ -117,10 +119,10 @@ nffw_res_fwinfos(struct nfp_nffw_info_data *fwinf, struct nffw_fwinfo **arr)\n struct nfp_nffw_info *\n nfp_nffw_info_open(struct nfp_cpp *cpp)\n {\n-\tstruct nfp_nffw_info_data *fwinf;\n-\tstruct nfp_nffw_info *state;\n-\tuint32_t info_ver;\n \tint err;\n+\tuint32_t info_ver;\n+\tstruct nfp_nffw_info *state;\n+\tstruct nfp_nffw_info_data *fwinf;\n \n \tstate = malloc(sizeof(*state));\n \tif (state == NULL)\n@@ -182,8 +184,9 @@ nfp_nffw_info_close(struct nfp_nffw_info *state)\n static struct nffw_fwinfo *\n nfp_nffw_info_fwid_first(struct nfp_nffw_info *state)\n {\n+\tuint32_t i;\n+\tuint32_t cnt;\n \tstruct nffw_fwinfo *fwinfo;\n-\tuint32_t cnt, i;\n \n \tcnt = nffw_res_fwinfos(&state->fwinf, &fwinfo);\n \tif (cnt == 0)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c\nindex 87eed3d951..a00bd5870d 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp.c\n@@ -72,10 +72,11 @@ nfp_nsp_print_extended_error(uint32_t ret_val)\n static int\n nfp_nsp_check(struct nfp_nsp *state)\n {\n-\tstruct nfp_cpp *cpp = state->cpp;\n-\tuint64_t nsp_status, reg;\n-\tuint32_t nsp_cpp;\n \tint err;\n+\tuint64_t reg;\n+\tuint32_t nsp_cpp;\n+\tuint64_t nsp_status;\n+\tstruct nfp_cpp *cpp = state->cpp;\n \n \tnsp_cpp = nfp_resource_cpp_id(state->res);\n \tnsp_status = nfp_resource_address(state->res) + NSP_STATUS;\n@@ -113,9 +114,9 @@ nfp_nsp_check(struct nfp_nsp *state)\n struct nfp_nsp *\n nfp_nsp_open(struct nfp_cpp *cpp)\n {\n-\tstruct nfp_resource *res;\n-\tstruct nfp_nsp *state;\n \tint err;\n+\tstruct nfp_nsp *state;\n+\tstruct nfp_resource *res;\n \n \tres = nfp_resource_acquire(cpp, NFP_RESOURCE_NSP);\n \tif (res == NULL)\n@@ -170,13 +171,12 @@ nfp_nsp_wait_reg(struct nfp_cpp *cpp,\n \t\tuint64_t mask,\n \t\tuint64_t val)\n {\n-\tstruct timespec wait;\n-\tuint32_t count;\n \tint err;\n+\tuint32_t count = 0;\n+\tstruct timespec wait;\n \n \twait.tv_sec = 0;\n \twait.tv_nsec = 25000000;\n-\tcount = 0;\n \n \tfor (;;) {\n \t\terr = nfp_cpp_readq(cpp, nsp_cpp, addr, reg);\n@@ -217,10 +217,15 @@ nfp_nsp_command(struct nfp_nsp *state,\n \t\tuint32_t buff_cpp,\n \t\tuint64_t buff_addr)\n {\n-\tuint64_t reg, ret_val, nsp_base, nsp_buffer, nsp_status, nsp_command;\n-\tstruct nfp_cpp *cpp = state->cpp;\n-\tuint32_t nsp_cpp;\n \tint err;\n+\tuint64_t reg;\n+\tuint32_t nsp_cpp;\n+\tuint64_t ret_val;\n+\tuint64_t nsp_base;\n+\tuint64_t nsp_buffer;\n+\tuint64_t nsp_status;\n+\tuint64_t nsp_command;\n+\tstruct nfp_cpp *cpp = state->cpp;\n \n \tnsp_cpp = nfp_resource_cpp_id(state->res);\n \tnsp_base = nfp_resource_address(state->res);\n@@ -296,11 +301,13 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp,\n \t\tvoid *out_buf,\n \t\tunsigned int out_size)\n {\n-\tstruct nfp_cpp *cpp = nsp->cpp;\n+\tint err;\n+\tint ret;\n+\tuint64_t reg;\n \tsize_t max_size;\n-\tuint64_t reg, cpp_buf;\n-\tint ret, err;\n \tuint32_t cpp_id;\n+\tuint64_t cpp_buf;\n+\tstruct nfp_cpp *cpp = nsp->cpp;\n \n \tif (nsp->ver.minor < 13) {\n \t\tPMD_DRV_LOG(ERR, \"NSP: Code 0x%04x with buffer not supported ABI %hu.%hu)\",\n@@ -360,13 +367,12 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp,\n int\n nfp_nsp_wait(struct nfp_nsp *state)\n {\n-\tstruct timespec wait;\n-\tuint32_t count;\n \tint err;\n+\tint count = 0;\n+\tstruct timespec wait;\n \n \twait.tv_sec = 0;\n \twait.tv_nsec = 25000000;\n-\tcount = 0;\n \n \tfor (;;) {\n \t\terr = nfp_nsp_command(state, SPCODE_NOOP, 0, 0, 0);\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\nindex 31677b66e6..3081e22dad 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\n@@ -26,9 +26,9 @@ struct nsp_identify {\n struct nfp_nsp_identify *\n __nfp_nsp_identify(struct nfp_nsp *nsp)\n {\n-\tstruct nfp_nsp_identify *nspi = NULL;\n-\tstruct nsp_identify *ni;\n \tint ret;\n+\tstruct nsp_identify *ni;\n+\tstruct nfp_nsp_identify *nspi = NULL;\n \n \tif (nfp_nsp_get_abi_ver_minor(nsp) < 15)\n \t\treturn NULL;\n@@ -77,9 +77,9 @@ nfp_hwmon_read_sensor(struct nfp_cpp *cpp,\n \t\tenum nfp_nsp_sensor_id id,\n \t\tuint32_t *val)\n {\n-\tstruct nfp_sensors s;\n-\tstruct nfp_nsp *nsp;\n \tint ret;\n+\tstruct nfp_nsp *nsp;\n+\tstruct nfp_sensors s;\n \n \tnsp = nfp_nsp_open(cpp);\n \tif (nsp == NULL)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\nindex 899fcd7441..9e8a247e5c 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n@@ -149,9 +149,10 @@ nfp_eth_port_translate(struct nfp_nsp *nsp,\n \t\tuint32_t index,\n \t\tstruct nfp_eth_table_port *dst)\n {\n-\tuint32_t rate;\n \tuint32_t fec;\n-\tuint64_t port, state;\n+\tuint64_t port;\n+\tuint32_t rate;\n+\tuint64_t state;\n \n \tport = rte_le_to_cpu_64(src->port);\n \tstate = rte_le_to_cpu_64(src->state);\n@@ -199,7 +200,8 @@ nfp_eth_port_translate(struct nfp_nsp *nsp,\n static void\n nfp_eth_calc_port_geometry(struct nfp_eth_table *table)\n {\n-\tuint32_t i, j;\n+\tuint32_t i;\n+\tuint32_t j;\n \n \tfor (i = 0; i < table->count; i++) {\n \t\ttable->max_index = RTE_MAX(table->max_index,\n@@ -241,12 +243,13 @@ nfp_eth_calc_port_type(struct nfp_eth_table_port *entry)\n static struct nfp_eth_table *\n __nfp_eth_read_ports(struct nfp_nsp *nsp)\n {\n-\tunion eth_table_entry *entries;\n-\tstruct nfp_eth_table *table;\n-\tuint32_t table_sz;\n+\tint ret;\n \tuint32_t i;\n \tuint32_t j;\n-\tint ret, cnt = 0;\n+\tint cnt = 0;\n+\tuint32_t table_sz;\n+\tstruct nfp_eth_table *table;\n+\tunion eth_table_entry *entries;\n \tconst struct rte_ether_addr *mac;\n \n \tentries = malloc(NSP_ETH_TABLE_SIZE);\n@@ -320,8 +323,8 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp)\n struct nfp_eth_table *\n nfp_eth_read_ports(struct nfp_cpp *cpp)\n {\n-\tstruct nfp_eth_table *ret;\n \tstruct nfp_nsp *nsp;\n+\tstruct nfp_eth_table *ret;\n \n \tnsp = nfp_nsp_open(cpp);\n \tif (nsp == NULL)\n@@ -337,9 +340,9 @@ struct nfp_nsp *\n nfp_eth_config_start(struct nfp_cpp *cpp,\n \t\tuint32_t idx)\n {\n-\tunion eth_table_entry *entries;\n-\tstruct nfp_nsp *nsp;\n \tint ret;\n+\tstruct nfp_nsp *nsp;\n+\tunion eth_table_entry *entries;\n \n \tentries = malloc(NSP_ETH_TABLE_SIZE);\n \tif (entries == NULL)\n@@ -400,8 +403,8 @@ nfp_eth_config_cleanup_end(struct nfp_nsp *nsp)\n int\n nfp_eth_config_commit_end(struct nfp_nsp *nsp)\n {\n-\tunion eth_table_entry *entries = nfp_nsp_config_entries(nsp);\n \tint ret = 1;\n+\tunion eth_table_entry *entries = nfp_nsp_config_entries(nsp);\n \n \tif (nfp_nsp_config_modified(nsp)) {\n \t\tret = nfp_nsp_write_eth_table(nsp, entries, NSP_ETH_TABLE_SIZE);\n@@ -432,9 +435,9 @@ nfp_eth_set_mod_enable(struct nfp_cpp *cpp,\n \t\tuint32_t idx,\n \t\tint enable)\n {\n-\tunion eth_table_entry *entries;\n-\tstruct nfp_nsp *nsp;\n \tuint64_t reg;\n+\tstruct nfp_nsp *nsp;\n+\tunion eth_table_entry *entries;\n \n \tnsp = nfp_eth_config_start(cpp, idx);\n \tif (nsp == NULL)\n@@ -474,9 +477,9 @@ nfp_eth_set_configured(struct nfp_cpp *cpp,\n \t\tuint32_t idx,\n \t\tint configed)\n {\n-\tunion eth_table_entry *entries;\n-\tstruct nfp_nsp *nsp;\n \tuint64_t reg;\n+\tstruct nfp_nsp *nsp;\n+\tunion eth_table_entry *entries;\n \n \tnsp = nfp_eth_config_start(cpp, idx);\n \tif (nsp == NULL)\n@@ -515,9 +518,9 @@ nfp_eth_set_bit_config(struct nfp_nsp *nsp,\n \t\tuint32_t val,\n \t\tconst uint64_t ctrl_bit)\n {\n-\tunion eth_table_entry *entries = nfp_nsp_config_entries(nsp);\n-\tuint32_t idx = nfp_nsp_config_idx(nsp);\n \tuint64_t reg;\n+\tuint32_t idx = nfp_nsp_config_idx(nsp);\n+\tunion eth_table_entry *entries = nfp_nsp_config_entries(nsp);\n \n \t/*\n \t * Note: set features were added in ABI 0.14 but the error\n@@ -603,8 +606,8 @@ nfp_eth_set_fec(struct nfp_cpp *cpp,\n \t\tuint32_t idx,\n \t\tenum nfp_eth_fec mode)\n {\n-\tstruct nfp_nsp *nsp;\n \tint err;\n+\tstruct nfp_nsp *nsp;\n \n \tnsp = nfp_eth_config_start(cpp, idx);\n \tif (nsp == NULL)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_resource.c b/drivers/net/nfp/nfpcore/nfp_resource.c\nindex 9dd4832779..fa92f2762e 100644\n--- a/drivers/net/nfp/nfpcore/nfp_resource.c\n+++ b/drivers/net/nfp/nfpcore/nfp_resource.c\n@@ -67,10 +67,12 @@ static int\n nfp_cpp_resource_find(struct nfp_cpp *cpp,\n \t\tstruct nfp_resource *res)\n {\n-\tchar name_pad[NFP_RESOURCE_ENTRY_NAME_SZ + 2];\n+\tint ret;\n+\tuint32_t i;\n+\tuint32_t key;\n+\tuint32_t cpp_id;\n \tstruct nfp_resource_entry entry;\n-\tuint32_t cpp_id, key;\n-\tint ret, i;\n+\tchar name_pad[NFP_RESOURCE_ENTRY_NAME_SZ + 2];\n \n \tcpp_id = NFP_CPP_ID(NFP_RESOURCE_TBL_TARGET, 3, 0); /* Atomic read */\n \n@@ -152,11 +154,11 @@ struct nfp_resource *\n nfp_resource_acquire(struct nfp_cpp *cpp,\n \t\tconst char *name)\n {\n-\tstruct nfp_cpp_mutex *dev_mutex;\n-\tstruct nfp_resource *res;\n \tint err;\n+\tuint16_t count = 0;\n \tstruct timespec wait;\n-\tuint16_t count;\n+\tstruct nfp_resource *res;\n+\tstruct nfp_cpp_mutex *dev_mutex;\n \n \tres = malloc(sizeof(*res));\n \tif (res == NULL)\n@@ -175,7 +177,6 @@ nfp_resource_acquire(struct nfp_cpp *cpp,\n \n \twait.tv_sec = 0;\n \twait.tv_nsec = 1000000;\n-\tcount = 0;\n \n \tfor (;;) {\n \t\terr = nfp_resource_try_acquire(cpp, res, dev_mutex);\ndiff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c\nindex 243d3c9ce5..a34278beca 100644\n--- a/drivers/net/nfp/nfpcore/nfp_rtsym.c\n+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c\n@@ -85,8 +85,8 @@ nfp_rtsym_sw_entry_init(struct nfp_rtsym_table *cache,\n struct nfp_rtsym_table *\n nfp_rtsym_table_read(struct nfp_cpp *cpp)\n {\n-\tstruct nfp_rtsym_table *rtbl;\n \tstruct nfp_mip *mip;\n+\tstruct nfp_rtsym_table *rtbl;\n \n \tmip = nfp_mip_open(cpp);\n \trtbl = __nfp_rtsym_table_read(cpp, mip);\n@@ -99,13 +99,18 @@ struct nfp_rtsym_table *\n __nfp_rtsym_table_read(struct nfp_cpp *cpp,\n \t\tconst struct nfp_mip *mip)\n {\n-\tuint32_t strtab_addr, symtab_addr, strtab_size, symtab_size;\n-\tstruct nfp_rtsym_entry *rtsymtab;\n+\tint n;\n+\tint err;\n+\tuint32_t size;\n+\tuint32_t strtab_addr;\n+\tuint32_t symtab_addr;\n+\tuint32_t strtab_size;\n+\tuint32_t symtab_size;\n \tstruct nfp_rtsym_table *cache;\n+\tstruct nfp_rtsym_entry *rtsymtab;\n \tconst uint32_t dram =\n \t\tNFP_CPP_ID(NFP_CPP_TARGET_MU, NFP_CPP_ACTION_RW, 0) |\n \t\tNFP_ISL_EMEM0;\n-\tint err, n, size;\n \n \tif (mip == NULL)\n \t\treturn NULL;\n@@ -341,10 +346,10 @@ nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl,\n \t\tconst char *name,\n \t\tint *error)\n {\n-\tconst struct nfp_rtsym *sym;\n-\tuint32_t val32;\n-\tuint64_t val;\n \tint err;\n+\tuint64_t val;\n+\tuint32_t val32;\n+\tconst struct nfp_rtsym *sym;\n \n \tsym = nfp_rtsym_lookup(rtbl, name);\n \tif (sym == NULL) {\n", "prefixes": [ "v2", "05/27" ] }