Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 130705,
    "url": "http://patches.dpdk.org/api/patches/130705/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230824110956.1943559-3-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": "<20230824110956.1943559-3-chaoyong.he@corigine.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20230824110956.1943559-3-chaoyong.he@corigine.com",
    "date": "2023-08-24T11:09:31",
    "name": "[02/27] net/nfp: unify the indent coding style",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "bb72cb1f7240ebee6cea6f848754f38a3222c6a4",
    "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/20230824110956.1943559-3-chaoyong.he@corigine.com/mbox/",
    "series": [
        {
            "id": 29333,
            "url": "http://patches.dpdk.org/api/series/29333/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29333",
            "date": "2023-08-24T11:09:29",
            "name": "refact the nfpcore module",
            "version": 1,
            "mbox": "http://patches.dpdk.org/series/29333/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/130705/comments/",
    "check": "warning",
    "checks": "http://patches.dpdk.org/api/patches/130705/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 17569430EF;\n\tThu, 24 Aug 2023 13:11:08 +0200 (CEST)",
            "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 614AB43251;\n\tThu, 24 Aug 2023 13:10:55 +0200 (CEST)",
            "from NAM11-CO1-obe.outbound.protection.outlook.com\n (mail-co1nam11on2100.outbound.protection.outlook.com [40.107.220.100])\n by mails.dpdk.org (Postfix) with ESMTP id 739AC42D12\n for <dev@dpdk.org>; Thu, 24 Aug 2023 13:10:53 +0200 (CEST)",
            "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by PH0PR13MB6134.namprd13.prod.outlook.com (2603:10b6:510:295::13)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Thu, 24 Aug\n 2023 11:10:50 +0000",
            "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::51fe:5846:af8b:bace]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::51fe:5846:af8b:bace%3]) with mapi id 15.20.6699.020; Thu, 24 Aug 2023\n 11:10:49 +0000"
        ],
        "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=FBezZwqUFdXzWKCzJ5wRlCmlkBhR/ilf5QBBj01EBJdN6wY/TH9hSN+BLLc5oQiIrMjNtuOT/u4o6iumyElZLcmte02FxwHe0K4Ln9G911Y/XCukoX9P7dlaDJiZ7sftTNCxoEe+LescaGhKrM9nwsEV38qEldetHf7roItealbi0VwHfWek++QUMOp01iPHvnFSFUPRgzwZcv9+YgVrsf6AoVXdXMH2h3TY6Gcqv+Vh1AE0WgMx7NmVLPjjjKgjo3S6eNAGq4BQ/AwN8D2KybOa6qdcD2k8QYnpx12rycHF21K0bmEupbRhIvODNRcPT2/5B1r8Rbgs/jIXcWhmZQ==",
        "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=rC3c0VBoongMu8jcYECMYE4kACDoyO8EIzEs4qcGv+c=;\n b=bIJkmnIXub5fLbSOeMete0BbXEDXdx8+dTljFyErI22wVNHqGleBccsF/xYTM0T+aLa+NZ3YXA95isOsQkYV7MF5ii+lf4AOvZZybxugxRfca5GHFuDhUtesiBd4DM28yg5qx0o9IuW/1I/sedq5I6xfx+RO6DblUGZbWqk77iNoAYWOmiEtm+kw2WUIgy+ngHWs/PkI+pk7XRQk+uVn1/CgFj3ePDGsrB3AIq/IL4s+FtRuW+cDUtlKb9WUZTI9cbcuVodPMdIwfvorBwg99z1TeOI88OPcOWR4HhQv9kjpQLiXDVmj6C40dtJ+tonRCG9FRlsXrup/6o5o5j6JMA==",
        "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=rC3c0VBoongMu8jcYECMYE4kACDoyO8EIzEs4qcGv+c=;\n b=m+o0rM7uKEBK7pYE+RsXM+BFjudeY1/g/bEoQxxs1jdzyPFXhFlcGqNHOylq++apULq8GatGvevv2zHk+hPf+1SIdvTkQZba7QquA2a4yRRMb/zVjNrbtxYBjFmghgnXnfsVI5GW2roPorv0wI2/UEmpy0mh6+cPFy+uvxste58=",
        "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 02/27] net/nfp: unify the indent coding style",
        "Date": "Thu, 24 Aug 2023 19:09:31 +0800",
        "Message-Id": "<20230824110956.1943559-3-chaoyong.he@corigine.com>",
        "X-Mailer": "git-send-email 2.39.1",
        "In-Reply-To": "<20230824110956.1943559-1-chaoyong.he@corigine.com>",
        "References": "<20230824110956.1943559-1-chaoyong.he@corigine.com>",
        "Content-Type": "text/plain; charset=UTF-8",
        "Content-Transfer-Encoding": "8bit",
        "X-ClientProxiedBy": "SJ0PR05CA0005.namprd05.prod.outlook.com\n (2603:10b6:a03:33b::10) 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_|PH0PR13MB6134:EE_",
        "X-MS-Office365-Filtering-Correlation-Id": "e5fb5fe9-8436-4ce0-70d0-08dba492c5a9",
        "X-MS-Exchange-SenderADCheck": "1",
        "X-MS-Exchange-AntiSpam-Relay": "0",
        "X-Microsoft-Antispam": "BCL:0;",
        "X-Microsoft-Antispam-Message-Info": "\n dky1f9J7qy6dqXb1Y/OmZDnBtMthRZ9WVAth+RbID/WEc5wyADRxjls3JklqfArA0y1VuClaf7q/ZPkyYwYuqx844ctzo/EZm6+dYzhl5tBoYeOUuRhDCtXNNrISrJ2RwPyc7W3krQBYs3OZgu9bGsSAjK1xl9qG9cfg6dZbmJj1FGc0FIwK0HX6xi6GwxoccIs5yvWMZQmRlZ2Qq/pSl1llxOCoirlpD193qQ2tvn9FjvE4hMmUhDklq54aeCA+wnxb9Vxl5R76ns164p1MGcDfUMTFf5b5bA8Xbk5GH0n/J7okAmU6+jFSJ8eN/kp0DA8pVJbIhAOXI+scuSpvLq9qymdx/vqa1mnIxgyd4+Al7dShPROJRswt6HEMZO1tZ5TENW7lUs0NCFdV7ojK6xT69TD+Ks4vo5BOodINlM7OWh7XyiWivM8YuTfmTDLxNNFs2plJznpBSCNzngucsgTc2nWO5hmXB1tiyGqc33jrUoog28r2nbTmIZoRDCbbVV2yXZtZcJgiIO0yLX3N1dARe74nvVvMDbQWs9AaGS8VHg229+VbVuMWY8KoXxWx/7oQtnoUhxbwwtH14y5I654R/2vakBKhZtVrb/RCyAA5d5sRhBpObYAOF5pPdoQn7QDE12phhjnZWNyCYLQJGHUORhNACkf0w6IvU8NbQX7fdFE6KxQvvZ3e10c75x7Ui40lLbLzUlaaM+vQcAsyRXdDDZ3m7Gn6aeZa+m2vjIM=",
        "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)(366004)(136003)(376002)(39830400003)(1800799009)(451199024)(186009)(316002)(66556008)(6916009)(66946007)(66476007)(12101799020)(41300700001)(44832011)(5660300002)(8936002)(8676002)(38100700002)(66574015)(38350700002)(4326008)(30864003)(2906002)(83380400001)(26005)(86362001)(478600001)(107886003)(52116002)(36756003)(6506007)(6666004)(6512007)(6486002)(2616005)(1076003)(559001)(579004)(309714004);\n DIR:OUT; SFP:1102;",
        "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1",
        "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?ntIvFbveKGSvVcvjVas59E1QH0Iw?=\n\t=?utf-8?q?ra9vNXyfUFksnAejlOSKgOVUyPS3RwDz8JtTfBdF4aPDQUEv3ovYUrggK6E2swljn?=\n\t=?utf-8?q?c0ILs1ReoAN2E53W20ZYd4jqI84SAwFkQCZuigUUuGQTBfHg/pQYqwOVlJ+TmGPCJ?=\n\t=?utf-8?q?dDVeGmvjdkV7YP4fdTHH3lIC9mzbJ5tqWhQE9ZtF/sVmfq0lfqKA7c+PH4ztDonfT?=\n\t=?utf-8?q?dF7J+U9qzpibpXf/yU0EZ6ApaE8CP21eRoCu6NwJppp3bvHn3AAyFDnF0vW5Bi8Mv?=\n\t=?utf-8?q?47jd7y+kqCi9FYGbKbmeq0ChhbJqNMXIN67acclntw3iRThYmoO0UNiXFXFGlXyW0?=\n\t=?utf-8?q?HVa7/s0NWwWZlwNbO3LWsJ3kTK4hy79V/qtD3hjqpfmUUFOt1E7vpGc0VHZuocfb1?=\n\t=?utf-8?q?cG900a8YOu64U67/zO+WNu2GQCT9+xmD0tymD28cvD1ZMjwgedwa9fL3FPLRH02q2?=\n\t=?utf-8?q?APJzQQLGvQpUs/DoNPGS2xfCUAL0qDOONEIUcKzpXFksIiA4PckbYo08s+mugGVSq?=\n\t=?utf-8?q?xyu7kzF//V/+j2N2igzToVjdGQYmlJZcJRQPiG9khGF+qrjP8I7h6bBT4dhhi449V?=\n\t=?utf-8?q?7ibXHxguHeXhXTLqN/NSe8u/B3NXK1nGfEdVeKyhbfuPoVuI3N7eod/975buEXgJb?=\n\t=?utf-8?q?A513CYxFvPoBRblUztnKY1ST45pRdQ+fEznW7cMAF5S3zyS9M2ReMf6ny2yc3ZjLY?=\n\t=?utf-8?q?WZ4CsjWP+QVIejx2HI3IpeG6ZIaYzwqlGvWa6xDCi+HCMoJUkYz+28lCmuVSebr41?=\n\t=?utf-8?q?P5rv92w4NeCQ21g2S/jhiskxkcZsDdXw4V4jTkP7N8VUNqQua7DYZGlRUjRPd06C6?=\n\t=?utf-8?q?8r2jYW5k/h57lxbuXVYxU0ruZAjdb1J8sA6d6FycmnhOGt/hIOGwVfaXo7QX6/riX?=\n\t=?utf-8?q?NjU2DFj2VPOGZlor1mwd40AOa+Y47W9uzDs8qEv2U0yv608bhci173TJw7SbIHT20?=\n\t=?utf-8?q?gnGCcOnglSjzgN85o1ZO1/vdsoCZSoZYjwX2G6ll9uj9eLcJsIgGpEZ+J9kO7kOoC?=\n\t=?utf-8?q?n8DziifsWRGrdbSvhqM7yasMARrOo6+cvzuwFyfekBDxgYFAjmaWP+X9QhSOC0eX9?=\n\t=?utf-8?q?nxOhyfKjm8JsVRD1F5Zhosv+NPzwKo6HNMj8jn3Ci1om/PQOrvWEDQ1UkjjfWBh1o?=\n\t=?utf-8?q?/Vryre4CmoYqexhI/hdnHlIwU5bQvyugwzwTrLHUMdqswCjtOKS6L2Jg974mDal9+?=\n\t=?utf-8?q?pzXQyGcZlvcKYORuXKuqkK5z5m9JfwNhHAKIWj9mgIm6r7e9RxFsv56wfGmi0hfSZ?=\n\t=?utf-8?q?T4dyvA7Ag/mXsZuCw04N2pOb8aCK6bxBbbudxYw8x7KUAPMqoRcqchyC31eG8QRwg?=\n\t=?utf-8?q?6CpyB/uxoVjWF0R2YGiacS5qIi59m1Scen+I5e4Y5ErVatSbKMSkSymvnwdMy4DAz?=\n\t=?utf-8?q?OS9fLhJsnZiRG+b8H5Uq3GhduhC7eDjsykhqJ9AJweBHwbgJ/85SXcE3WUnO5ct/n?=\n\t=?utf-8?q?MXZ9Hln+lXRRzxpb9V9XP96qNKYEaJ6im5UhczP/FSt0WJ1jDPoyyFkaSB1epvKpk?=\n\t=?utf-8?q?sTj4g9l2uliadHH/6k0M3IDpKen1DPnmYw=3D=3D?=",
        "X-OriginatorOrg": "corigine.com",
        "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n e5fb5fe9-8436-4ce0-70d0-08dba492c5a9",
        "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com",
        "X-MS-Exchange-CrossTenant-AuthAs": "Internal",
        "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "24 Aug 2023 11:10:49.8860 (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 EpKPcKibZQrguI2aZz3xN1NxZhqqCw7pJ4ASeRIvLfKb6cGNkck7fCepGvkSy+xQq8XzefBwsvu6VoTbPn7reUbXZG9+ez7R8S2eWxtvPdk=",
        "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH0PR13MB6134",
        "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": "Each parameter of function should occupy one line, and indent two TAB\ncharacter.\nAll the statement which span multi line should indent two TAB character.\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.h          |  80 +++++-----\n drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 152 ++++++++++--------\n drivers/net/nfp/nfpcore/nfp_cppcore.c      | 173 +++++++++++++--------\n drivers/net/nfp/nfpcore/nfp_hwinfo.c       |  23 +--\n drivers/net/nfp/nfpcore/nfp_mip.c          |  21 ++-\n drivers/net/nfp/nfpcore/nfp_mip.h          |   2 +-\n drivers/net/nfp/nfpcore/nfp_mutex.c        |  25 +--\n drivers/net/nfp/nfpcore/nfp_nffw.c         |   9 +-\n drivers/net/nfp/nfpcore/nfp_nsp.c          | 108 +++++++------\n drivers/net/nfp/nfpcore/nfp_nsp.h          |  19 +--\n drivers/net/nfp/nfpcore/nfp_nsp_cmds.c     |   4 +-\n drivers/net/nfp/nfpcore/nfp_nsp_eth.c      |  69 ++++----\n drivers/net/nfp/nfpcore/nfp_resource.c     |  29 ++--\n drivers/net/nfp/nfpcore/nfp_resource.h     |   2 +-\n drivers/net/nfp/nfpcore/nfp_rtsym.c        |  38 +++--\n drivers/net/nfp/nfpcore/nfp_rtsym.h        |  15 +-\n 16 files changed, 447 insertions(+), 322 deletions(-)",
    "diff": "diff --git a/drivers/net/nfp/nfpcore/nfp_cpp.h b/drivers/net/nfp/nfpcore/nfp_cpp.h\nindex 8f87c09327..54bef3cb6b 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp.h\n@@ -56,7 +56,8 @@ struct nfp_cpp_operations {\n \tsize_t area_priv_size;\n \n \t/* Instance an NFP CPP */\n-\tint (*init)(struct nfp_cpp *cpp, struct rte_pci_device *dev);\n+\tint (*init)(struct nfp_cpp *cpp,\n+\t\t\tstruct rte_pci_device *dev);\n \n \t/*\n \t * Free the bus.\n@@ -69,9 +70,9 @@ struct nfp_cpp_operations {\n \t * NOTE: This is _not_ serialized\n \t */\n \tint (*area_init)(struct nfp_cpp_area *area,\n-\t\t\t uint32_t dest,\n-\t\t\t unsigned long long address,\n-\t\t\t unsigned long size);\n+\t\t\tuint32_t dest,\n+\t\t\tunsigned long long address,\n+\t\t\tunsigned long size);\n \t/*\n \t * Clean up a NFP CPP area before it is freed\n \t * NOTE: This is _not_ serialized\n@@ -101,17 +102,17 @@ struct nfp_cpp_operations {\n \t * Serialized\n \t */\n \tint (*area_read)(struct nfp_cpp_area *area,\n-\t\t\t void *kernel_vaddr,\n-\t\t\t unsigned long offset,\n-\t\t\t unsigned int length);\n+\t\t\tvoid *kernel_vaddr,\n+\t\t\tunsigned long offset,\n+\t\t\tunsigned int length);\n \t/*\n \t * Perform a write to a NFP CPP area\n \t * Serialized\n \t */\n \tint (*area_write)(struct nfp_cpp_area *area,\n-\t\t\t  const void *kernel_vaddr,\n-\t\t\t  unsigned long offset,\n-\t\t\t  unsigned int length);\n+\t\t\tconst void *kernel_vaddr,\n+\t\t\tunsigned long offset,\n+\t\t\tunsigned int length);\n };\n \n /*\n@@ -239,7 +240,7 @@ void nfp_cpp_interface_set(struct nfp_cpp *cpp, uint32_t interface);\n  * @param   len     Length of the serial byte array\n  */\n int nfp_cpp_serial_set(struct nfp_cpp *cpp, const uint8_t *serial,\n-\t\t       size_t serial_len);\n+\t\tsize_t serial_len);\n \n /*\n  * Set the private data of the nfp_cpp instance\n@@ -279,7 +280,7 @@ uint32_t __nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model);\n  * @return NFP CPP handle, or NULL on failure.\n  */\n struct nfp_cpp *nfp_cpp_from_device_name(struct rte_pci_device *dev,\n-\t\t\t\t\t int driver_lock_needed);\n+\t\tint driver_lock_needed);\n \n /*\n  * Free a NFP CPP handle\n@@ -397,8 +398,7 @@ int nfp_cpp_serial(struct nfp_cpp *cpp, const uint8_t **serial);\n  * @return NFP CPP handle, or NULL on failure.\n  */\n struct nfp_cpp_area *nfp_cpp_area_alloc(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\t\t\t\tunsigned long long address,\n-\t\t\t\t\tunsigned long size);\n+\t\tunsigned long long address, unsigned long size);\n \n /*\n  * Allocate a NFP CPP area handle, as an offset into a CPP ID, by a named owner\n@@ -411,10 +411,8 @@ struct nfp_cpp_area *nfp_cpp_area_alloc(struct nfp_cpp *cpp, uint32_t cpp_id,\n  * @return NFP CPP handle, or NULL on failure.\n  */\n struct nfp_cpp_area *nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp,\n-\t\t\t\t\t\t  uint32_t cpp_id,\n-\t\t\t\t\t\t  const char *name,\n-\t\t\t\t\t\t  unsigned long long address,\n-\t\t\t\t\t\t  unsigned long size);\n+\t\tuint32_t cpp_id, const char *name, unsigned long long address,\n+\t\tunsigned long size);\n \n /*\n  * Free an allocated NFP CPP area handle\n@@ -448,9 +446,7 @@ void nfp_cpp_area_release(struct nfp_cpp_area *area);\n  * @return NFP CPP handle, or NULL on failure.\n  */\n struct nfp_cpp_area *nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp,\n-\t\t\t\t\t\tuint32_t cpp_id,\n-\t\t\t\t\t\tunsigned long long address,\n-\t\t\t\t\t\tunsigned long size);\n+\t\tuint32_t cpp_id, unsigned long long address, unsigned long size);\n \n /*\n  * Release the resources, then free the NFP CPP area handle\n@@ -459,8 +455,7 @@ struct nfp_cpp_area *nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp,\n void nfp_cpp_area_release_free(struct nfp_cpp_area *area);\n \n uint8_t *nfp_cpp_map_area(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\t\t   uint64_t addr, unsigned long size,\n-\t\t\t   struct nfp_cpp_area **area);\n+\t\tuint64_t addr, unsigned long size, struct nfp_cpp_area **area);\n /*\n  * Return an IO pointer to the beginning of the NFP CPP area handle. The area\n  * must be acquired with 'nfp_cpp_area_acquire()' before calling this operation.\n@@ -484,7 +479,7 @@ void *nfp_cpp_area_mapped(struct nfp_cpp_area *area);\n  *\n  */\n int nfp_cpp_area_read(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t      void *buffer, size_t length);\n+\t\tvoid *buffer, size_t length);\n \n /*\n  * Write to a NFP CPP area handle from a buffer. The area must be acquired with\n@@ -498,7 +493,7 @@ int nfp_cpp_area_read(struct nfp_cpp_area *area, unsigned long offset,\n  * @return bytes written on success, negative value on failure.\n  */\n int nfp_cpp_area_write(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t       const void *buffer, size_t length);\n+\t\tconst void *buffer, size_t length);\n \n /*\n  * nfp_cpp_area_iomem() - get IOMEM region for CPP area\n@@ -522,7 +517,7 @@ void *nfp_cpp_area_iomem(struct nfp_cpp_area *area);\n  * @return 0 on success, negative value on failure.\n  */\n int nfp_cpp_area_check_range(struct nfp_cpp_area *area,\n-\t\t\t     unsigned long long offset, unsigned long size);\n+\t\tunsigned long long offset, unsigned long size);\n \n /*\n  * Get the NFP CPP handle that is the parent of a NFP CPP area handle\n@@ -552,7 +547,7 @@ const char *nfp_cpp_area_name(struct nfp_cpp_area *cpp_area);\n  * @return bytes read on success, -1 on failure.\n  */\n int nfp_cpp_read(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\t unsigned long long address, void *kernel_vaddr, size_t length);\n+\t\tunsigned long long address, void *kernel_vaddr, size_t length);\n \n /*\n  * Write a block of data to a NFP CPP ID\n@@ -566,8 +561,8 @@ int nfp_cpp_read(struct nfp_cpp *cpp, uint32_t cpp_id,\n  * @return bytes written on success, -1 on failure.\n  */\n int nfp_cpp_write(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\t  unsigned long long address, const void *kernel_vaddr,\n-\t\t  size_t length);\n+\t\tunsigned long long address, const void *kernel_vaddr,\n+\t\tsize_t length);\n \n \n \n@@ -582,7 +577,7 @@ int nfp_cpp_write(struct nfp_cpp *cpp, uint32_t cpp_id,\n  * @return bytes written on success, negative value on failure.\n  */\n int nfp_cpp_area_fill(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t      uint32_t value, size_t length);\n+\t\tuint32_t value, size_t length);\n \n /*\n  * Read a single 32-bit value from a NFP CPP area handle\n@@ -599,7 +594,7 @@ int nfp_cpp_area_fill(struct nfp_cpp_area *area, unsigned long offset,\n  * @return 0 on success, or -1 on error.\n  */\n int nfp_cpp_area_readl(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t       uint32_t *value);\n+\t\tuint32_t *value);\n \n /*\n  * Write a single 32-bit value to a NFP CPP area handle\n@@ -616,7 +611,7 @@ int nfp_cpp_area_readl(struct nfp_cpp_area *area, unsigned long offset,\n  * @return 0 on success, or -1 on error.\n  */\n int nfp_cpp_area_writel(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t\tuint32_t value);\n+\t\tuint32_t value);\n \n /*\n  * Read a single 64-bit value from a NFP CPP area handle\n@@ -633,7 +628,7 @@ int nfp_cpp_area_writel(struct nfp_cpp_area *area, unsigned long offset,\n  * @return 0 on success, or -1 on error.\n  */\n int nfp_cpp_area_readq(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t       uint64_t *value);\n+\t\tuint64_t *value);\n \n /*\n  * Write a single 64-bit value to a NFP CPP area handle\n@@ -650,7 +645,7 @@ int nfp_cpp_area_readq(struct nfp_cpp_area *area, unsigned long offset,\n  * @return 0 on success, or -1 on error.\n  */\n int nfp_cpp_area_writeq(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t\tuint64_t value);\n+\t\tuint64_t value);\n \n /*\n  * Write a single 32-bit value on the XPB bus\n@@ -685,7 +680,7 @@ int nfp_xpb_readl(struct nfp_cpp *cpp, uint32_t xpb_tgt, uint32_t *value);\n  * @return 0 on success, or -1 on failure.\n  */\n int nfp_xpb_writelm(struct nfp_cpp *cpp, uint32_t xpb_tgt, uint32_t mask,\n-\t\t    uint32_t value);\n+\t\tuint32_t value);\n \n /*\n  * Modify bits of a 32-bit value from the XPB bus\n@@ -699,7 +694,7 @@ int nfp_xpb_writelm(struct nfp_cpp *cpp, uint32_t xpb_tgt, uint32_t mask,\n  * @return >= 0 on success, negative value on failure.\n  */\n int nfp_xpb_waitlm(struct nfp_cpp *cpp, uint32_t xpb_tgt, uint32_t mask,\n-\t\t   uint32_t value, int timeout_us);\n+\t\tuint32_t value, int timeout_us);\n \n /*\n  * Read a 32-bit word from a NFP CPP ID\n@@ -712,7 +707,7 @@ int nfp_xpb_waitlm(struct nfp_cpp *cpp, uint32_t xpb_tgt, uint32_t mask,\n  * @return 0 on success, or -1 on failure.\n  */\n int nfp_cpp_readl(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\t  unsigned long long address, uint32_t *value);\n+\t\tunsigned long long address, uint32_t *value);\n \n /*\n  * Write a 32-bit value to a NFP CPP ID\n@@ -726,7 +721,7 @@ int nfp_cpp_readl(struct nfp_cpp *cpp, uint32_t cpp_id,\n  *\n  */\n int nfp_cpp_writel(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\t   unsigned long long address, uint32_t value);\n+\t\tunsigned long long address, uint32_t value);\n \n /*\n  * Read a 64-bit work from a NFP CPP ID\n@@ -739,7 +734,7 @@ int nfp_cpp_writel(struct nfp_cpp *cpp, uint32_t cpp_id,\n  * @return 0 on success, or -1 on failure.\n  */\n int nfp_cpp_readq(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\t  unsigned long long address, uint64_t *value);\n+\t\tunsigned long long address, uint64_t *value);\n \n /*\n  * Write a 64-bit value to a NFP CPP ID\n@@ -752,7 +747,7 @@ int nfp_cpp_readq(struct nfp_cpp *cpp, uint32_t cpp_id,\n  * @return 0 on success, or -1 on failure.\n  */\n int nfp_cpp_writeq(struct nfp_cpp *cpp, uint32_t cpp_id,\n-\t\t   unsigned long long address, uint64_t value);\n+\t\tunsigned long long address, uint64_t value);\n \n /*\n  * Initialize a mutex location\n@@ -773,7 +768,7 @@ int nfp_cpp_writeq(struct nfp_cpp *cpp, uint32_t cpp_id,\n  * @return 0 on success, negative value on failure.\n  */\n int nfp_cpp_mutex_init(struct nfp_cpp *cpp, int target,\n-\t\t       unsigned long long address, uint32_t key_id);\n+\t\tunsigned long long address, uint32_t key_id);\n \n /*\n  * Create a mutex handle from an address controlled by a MU Atomic engine\n@@ -793,8 +788,7 @@ int nfp_cpp_mutex_init(struct nfp_cpp *cpp, int target,\n  *                      failure.\n  */\n struct nfp_cpp_mutex *nfp_cpp_mutex_alloc(struct nfp_cpp *cpp, int target,\n-\t\t\t\t\t  unsigned long long address,\n-\t\t\t\t\t  uint32_t key_id);\n+\t\tunsigned long long address, uint32_t key_id);\n \n /*\n  * Get the NFP CPP handle the mutex was created with\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\nindex 2ee60eefc3..884cc84eaa 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c\n@@ -130,9 +130,15 @@ nfp_bar_maptype(struct nfp_bar *bar)\n #define TARGET_WIDTH_64    8\n \n static int\n-nfp_compute_bar(const struct nfp_bar *bar, uint32_t *bar_config,\n-\t\tuint64_t *bar_base, int tgt, int act, int tok,\n-\t\tuint64_t offset, size_t size, int width)\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\tuint64_t offset,\n+\t\tsize_t size,\n+\t\tint width)\n {\n \tuint32_t bitsize;\n \tuint32_t newcfg;\n@@ -143,19 +149,16 @@ nfp_compute_bar(const struct nfp_bar *bar, uint32_t *bar_config,\n \n \tswitch (width) {\n \tcase 8:\n-\t\tnewcfg =\n-\t\t    NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT\n-\t\t    (NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_64BIT);\n+\t\tnewcfg = NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT\n+\t\t\t\t(NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_64BIT);\n \t\tbreak;\n \tcase 4:\n-\t\tnewcfg =\n-\t\t    NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT\n-\t\t    (NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_32BIT);\n+\t\tnewcfg = NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT\n+\t\t\t\t(NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_32BIT);\n \t\tbreak;\n \tcase 0:\n-\t\tnewcfg =\n-\t\t    NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT\n-\t\t    (NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_0BYTE);\n+\t\tnewcfg = NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT\n+\t\t\t\t(NFP_PCIE_BAR_PCIE2CPP_LENGTHSELECT_0BYTE);\n \t\tbreak;\n \tdefault:\n \t\treturn -EINVAL;\n@@ -165,60 +168,58 @@ nfp_compute_bar(const struct nfp_bar *bar, uint32_t *bar_config,\n \t\t/* Fixed CPP mapping with specific action */\n \t\tmask = ~(NFP_PCIE_P2C_FIXED_SIZE(bar) - 1);\n \n-\t\tnewcfg |=\n-\t\t    NFP_PCIE_BAR_PCIE2CPP_MAPTYPE\n-\t\t    (NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_FIXED);\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 \n \t\tif ((offset & mask) != ((offset + size - 1) & mask)) {\n \t\t\tPMD_DRV_LOG(ERR, \"BAR%d: Won't use for Fixed mapping <%#llx,%#llx>, action=%d BAR too small (0x%llx)\",\n-\t\t\t\t    bar->index, (unsigned long long)offset,\n-\t\t\t\t    (unsigned long long)(offset + size), act,\n-\t\t\t\t    (unsigned long long)mask);\n+\t\t\t\t\tbar->index, (unsigned long long)offset,\n+\t\t\t\t\t(unsigned long long)(offset + size), act,\n+\t\t\t\t\t(unsigned long long)mask);\n \t\t\treturn -EINVAL;\n \t\t}\n \t\toffset &= mask;\n \n \t\tPMD_DRV_LOG(DEBUG, \"BAR%d: Created Fixed mapping %d:%d:%d:0x%#llx-0x%#llx>\",\n-\t\t\t    bar->index, tgt, act, tok, (unsigned long long)offset,\n-\t\t\t    (unsigned long long)(offset + mask));\n+\t\t\t\tbar->index, tgt, act, tok, (unsigned long long)offset,\n+\t\t\t\t(unsigned long long)(offset + mask));\n \n \t\tbitsize = 40 - 16;\n \t} else {\n \t\tmask = ~(NFP_PCIE_P2C_BULK_SIZE(bar) - 1);\n \n \t\t/* Bulk mapping */\n-\t\tnewcfg |=\n-\t\t    NFP_PCIE_BAR_PCIE2CPP_MAPTYPE\n-\t\t    (NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_BULK);\n+\t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_MAPTYPE\n+\t\t\t\t(NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_BULK);\n \n \t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_TARGET_BASEADDRESS(tgt);\n \t\tnewcfg |= NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS(tok);\n \n \t\tif ((offset & mask) != ((offset + size - 1) & mask)) {\n \t\t\tPMD_DRV_LOG(ERR, \"BAR%d: Won't use for bulk mapping <%#llx,%#llx> target=%d, token=%d BAR too small (%#llx) - (%#llx != %#llx).\",\n-\t\t\t\t    bar->index, (unsigned long long)offset,\n-\t\t\t\t    (unsigned long long)(offset + size),\n-\t\t\t\t    tgt, tok, (unsigned long long)mask,\n-\t\t\t\t    (unsigned long long)(offset & mask),\n-\t\t\t\t    (unsigned long long)(offset + size - 1) & mask);\n+\t\t\t\t\tbar->index, (unsigned long long)offset,\n+\t\t\t\t\t(unsigned long long)(offset + size),\n+\t\t\t\t\ttgt, tok, (unsigned long long)mask,\n+\t\t\t\t\t(unsigned long long)(offset & mask),\n+\t\t\t\t\t(unsigned long long)(offset + size - 1) & mask);\n \t\t\treturn -EINVAL;\n \t\t}\n \n \t\toffset &= mask;\n \n \t\tPMD_DRV_LOG(DEBUG, \"BAR%d: Created bulk mapping %d:x:%d:%#llx-%#llx\",\n-\t\t\t    bar->index, tgt, tok, (unsigned long long)offset,\n-\t\t\t    (unsigned long long)(offset + ~mask));\n+\t\t\t\tbar->index, tgt, tok, (unsigned long long)offset,\n+\t\t\t\t(unsigned long long)(offset + ~mask));\n \n \t\tbitsize = 40 - 21;\n \t}\n \n \tif (bar->bitsize < bitsize) {\n \t\tPMD_DRV_LOG(ERR, \"BAR%d: Too small for %d:%d:%d\", bar->index,\n-\t\t\t    tgt, tok, act);\n+\t\t\t\ttgt, tok, act);\n \t\treturn -EINVAL;\n \t}\n \n@@ -234,8 +235,9 @@ nfp_compute_bar(const struct nfp_bar *bar, uint32_t *bar_config,\n }\n \n static int\n-nfp_bar_write(struct nfp_pcie_user *nfp, struct nfp_bar *bar,\n-\t\t  uint32_t newcfg)\n+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 \n@@ -246,7 +248,7 @@ nfp_bar_write(struct nfp_pcie_user *nfp, struct nfp_bar *bar,\n \t\treturn (-ENOMEM);\n \n \tbar->csr = nfp->cfg +\n-\t\t   NFP_PCIE_CFG_BAR_PCIETOCPPEXPBAR(nfp->dev_id, base, slot);\n+\t\t\tNFP_PCIE_CFG_BAR_PCIETOCPPEXPBAR(nfp->dev_id, base, slot);\n \n \t*(uint32_t *)(bar->csr) = newcfg;\n \n@@ -257,15 +259,21 @@ nfp_bar_write(struct nfp_pcie_user *nfp, struct nfp_bar *bar,\n }\n \n static int\n-nfp_reconfigure_bar(struct nfp_pcie_user *nfp, struct nfp_bar *bar, int tgt,\n-\t\tint act, int tok, uint64_t offset, size_t size, int width)\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\tuint64_t offset,\n+\t\tsize_t size,\n+\t\tint width)\n {\n \tuint64_t newbase;\n \tuint32_t newcfg;\n \tint err;\n \n \terr = nfp_compute_bar(bar, &newcfg, &newbase, tgt, act, tok, offset,\n-\t\t\t      size, width);\n+\t\t\tsize, width);\n \tif (err != 0)\n \t\treturn err;\n \n@@ -390,8 +398,10 @@ struct nfp6000_area_priv {\n };\n \n static int\n-nfp6000_area_init(struct nfp_cpp_area *area, uint32_t dest,\n-\t\t  unsigned long long address, unsigned long size)\n+nfp6000_area_init(struct nfp_cpp_area *area,\n+\t\tuint32_t dest,\n+\t\tunsigned long long address,\n+\t\tunsigned long 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@@ -400,8 +410,7 @@ nfp6000_area_init(struct nfp_cpp_area *area, uint32_t dest,\n \tuint32_t token = NFP_CPP_ID_TOKEN_of(dest);\n \tint pp, ret = 0;\n \n-\tpp = nfp_target_pushpull(NFP_CPP_ID(target, action, token),\n-\t\t\t\t     address);\n+\tpp = nfp_target_pushpull(NFP_CPP_ID(target, action, token), address);\n \tif (pp < 0)\n \t\treturn pp;\n \n@@ -409,7 +418,8 @@ nfp6000_area_init(struct nfp_cpp_area *area, uint32_t dest,\n \tpriv->width.write = PULL_WIDTH(pp);\n \n \tif (priv->width.read > 0 &&\n-\t    priv->width.write > 0 && priv->width.read != priv->width.write)\n+\t\t\tpriv->width.write > 0 &&\n+\t\t\tpriv->width.read != priv->width.write)\n \t\treturn -EINVAL;\n \n \tif (priv->width.read > 0)\n@@ -428,8 +438,8 @@ nfp6000_area_init(struct nfp_cpp_area *area, uint32_t dest,\n \tpriv->size = size;\n \n \tret = nfp_reconfigure_bar(nfp, priv->bar, priv->target, priv->action,\n-\t\t\t\t  priv->token, priv->offset, priv->size,\n-\t\t\t\t  priv->width.bar);\n+\t\t\tpriv->token, priv->offset, priv->size,\n+\t\t\tpriv->width.bar);\n \n \treturn ret;\n }\n@@ -441,14 +451,13 @@ nfp6000_area_acquire(struct nfp_cpp_area *area)\n \n \t/* Calculate offset into BAR. */\n \tif (nfp_bar_maptype(priv->bar) ==\n-\t    NFP_PCIE_BAR_PCIE2CPP_MAPTYPE_GENERAL) {\n+\t\t\tNFP_PCIE_BAR_PCIE2CPP_MAPTYPE_GENERAL) {\n \t\tpriv->bar_offset = priv->offset &\n-\t\t\t(NFP_PCIE_P2C_GENERAL_SIZE(priv->bar) - 1);\n-\t\tpriv->bar_offset +=\n-\t\t\tNFP_PCIE_P2C_GENERAL_TARGET_OFFSET(priv->bar,\n-\t\t\t\t\t\t\t   priv->target);\n-\t\tpriv->bar_offset +=\n-\t\t    NFP_PCIE_P2C_GENERAL_TOKEN_OFFSET(priv->bar, priv->token);\n+\t\t\t\t(NFP_PCIE_P2C_GENERAL_SIZE(priv->bar) - 1);\n+\t\tpriv->bar_offset += NFP_PCIE_P2C_GENERAL_TARGET_OFFSET(priv->bar,\n+\t\t\t\tpriv->target);\n+\t\tpriv->bar_offset += NFP_PCIE_P2C_GENERAL_TOKEN_OFFSET(priv->bar,\n+\t\t\t\tpriv->token);\n \t} else {\n \t\tpriv->bar_offset = priv->offset & priv->bar->mask;\n \t}\n@@ -490,8 +499,10 @@ nfp6000_area_iomem(struct nfp_cpp_area *area)\n }\n \n static int\n-nfp6000_area_read(struct nfp_cpp_area *area, void *kernel_vaddr,\n-\t\t  unsigned long offset, unsigned int length)\n+nfp6000_area_read(struct nfp_cpp_area *area,\n+\t\tvoid *kernel_vaddr,\n+\t\tunsigned long offset,\n+\t\tunsigned int length)\n {\n \tuint64_t *wrptr64 = kernel_vaddr;\n \tconst volatile uint64_t *rdptr64;\n@@ -524,17 +535,17 @@ nfp6000_area_read(struct nfp_cpp_area *area, void *kernel_vaddr,\n \n \t/* MU reads via a PCIe2CPP BAR supports 32bit (and other) lengths */\n \tif (priv->target == (NFP_CPP_TARGET_ID_MASK & NFP_CPP_TARGET_MU) &&\n-\t    priv->action == NFP_CPP_ACTION_RW) {\n+\t\t\tpriv->action == NFP_CPP_ACTION_RW) {\n \t\tis_64 = false;\n \t}\n \n \tif (is_64) {\n \t\tif (offset % sizeof(uint64_t) != 0 ||\n-\t\t    length % sizeof(uint64_t) != 0)\n+\t\t\t\tlength % sizeof(uint64_t) != 0)\n \t\t\treturn -EINVAL;\n \t} else {\n \t\tif (offset % sizeof(uint32_t) != 0 ||\n-\t\t    length % sizeof(uint32_t) != 0)\n+\t\t\t\tlength % sizeof(uint32_t) != 0)\n \t\t\treturn -EINVAL;\n \t}\n \n@@ -558,8 +569,10 @@ nfp6000_area_read(struct nfp_cpp_area *area, void *kernel_vaddr,\n }\n \n static int\n-nfp6000_area_write(struct nfp_cpp_area *area, const void *kernel_vaddr,\n-\t\t   unsigned long offset, unsigned int length)\n+nfp6000_area_write(struct nfp_cpp_area *area,\n+\t\tconst void *kernel_vaddr,\n+\t\tunsigned long offset,\n+\t\tunsigned int length)\n {\n \tconst uint64_t *rdptr64 = kernel_vaddr;\n \tuint64_t *wrptr64;\n@@ -590,16 +603,16 @@ nfp6000_area_write(struct nfp_cpp_area *area, const void *kernel_vaddr,\n \n \t/* MU writes via a PCIe2CPP BAR supports 32bit (and other) lengths */\n \tif (priv->target == (NFP_CPP_TARGET_ID_MASK & NFP_CPP_TARGET_MU) &&\n-\t    priv->action == NFP_CPP_ACTION_RW)\n+\t\t\tpriv->action == NFP_CPP_ACTION_RW)\n \t\tis_64 = false;\n \n \tif (is_64) {\n \t\tif (offset % sizeof(uint64_t) != 0 ||\n-\t\t    length % sizeof(uint64_t) != 0)\n+\t\t\t\tlength % sizeof(uint64_t) != 0)\n \t\t\treturn -EINVAL;\n \t} else {\n \t\tif (offset % sizeof(uint32_t) != 0 ||\n-\t\t    length % sizeof(uint32_t) != 0)\n+\t\t\t\tlength % sizeof(uint32_t) != 0)\n \t\t\treturn -EINVAL;\n \t}\n \n@@ -655,7 +668,8 @@ nfp_acquire_process_lock(struct nfp_pcie_user *desc)\n }\n \n static int\n-nfp6000_set_model(struct rte_pci_device *dev, struct nfp_cpp *cpp)\n+nfp6000_set_model(struct rte_pci_device *dev,\n+\t\tstruct nfp_cpp *cpp)\n {\n \tuint32_t model;\n \n@@ -671,7 +685,8 @@ nfp6000_set_model(struct rte_pci_device *dev, struct nfp_cpp *cpp)\n }\n \n static int\n-nfp6000_set_interface(struct rte_pci_device *dev, struct nfp_cpp *cpp)\n+nfp6000_set_interface(struct rte_pci_device *dev,\n+\t\tstruct nfp_cpp *cpp)\n {\n \tuint16_t interface;\n \n@@ -686,7 +701,8 @@ nfp6000_set_interface(struct rte_pci_device *dev, struct nfp_cpp *cpp)\n }\n \n static int\n-nfp6000_set_serial(struct rte_pci_device *dev, struct nfp_cpp *cpp)\n+nfp6000_set_serial(struct rte_pci_device *dev,\n+\t\tstruct nfp_cpp *cpp)\n {\n \tuint16_t tmp;\n \tuint8_t serial[6];\n@@ -733,7 +749,8 @@ nfp6000_set_serial(struct rte_pci_device *dev, struct nfp_cpp *cpp)\n }\n \n static int\n-nfp6000_set_barsz(struct rte_pci_device *dev, struct nfp_pcie_user *desc)\n+nfp6000_set_barsz(struct rte_pci_device *dev,\n+\t\tstruct nfp_pcie_user *desc)\n {\n \tunsigned long tmp;\n \tint i = 0;\n@@ -748,7 +765,8 @@ nfp6000_set_barsz(struct rte_pci_device *dev, struct nfp_pcie_user *desc)\n }\n \n static int\n-nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev)\n+nfp6000_init(struct nfp_cpp *cpp,\n+\t\tstruct rte_pci_device *dev)\n {\n \tint ret = 0;\n \tstruct nfp_pcie_user *desc;\n@@ -762,7 +780,7 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev)\n \tstrlcpy(desc->busdev, dev->device.name, sizeof(desc->busdev));\n \n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY &&\n-\t    cpp->driver_lock_needed) {\n+\t\t\tcpp->driver_lock_needed) {\n \t\tret = nfp_acquire_process_lock(desc);\n \t\tif (ret != 0)\n \t\t\tgoto error;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c\nindex 2c6ec3e126..25f7700b08 100644\n--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c\n+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c\n@@ -27,7 +27,8 @@\n \t\t\t\t\t\tNFP_PL_DEVICE_ID_MASK)\n \n void\n-nfp_cpp_priv_set(struct nfp_cpp *cpp, void *priv)\n+nfp_cpp_priv_set(struct nfp_cpp *cpp,\n+\t\tvoid *priv)\n {\n \tcpp->priv = priv;\n }\n@@ -39,7 +40,8 @@ nfp_cpp_priv(struct nfp_cpp *cpp)\n }\n \n void\n-nfp_cpp_model_set(struct nfp_cpp *cpp, uint32_t model)\n+nfp_cpp_model_set(struct nfp_cpp *cpp,\n+\t\tuint32_t model)\n {\n \tcpp->model = model;\n }\n@@ -62,21 +64,24 @@ nfp_cpp_model(struct nfp_cpp *cpp)\n }\n \n void\n-nfp_cpp_interface_set(struct nfp_cpp *cpp, uint32_t interface)\n+nfp_cpp_interface_set(struct nfp_cpp *cpp,\n+\t\tuint32_t interface)\n {\n \tcpp->interface = interface;\n }\n \n int\n-nfp_cpp_serial(struct nfp_cpp *cpp, const uint8_t **serial)\n+nfp_cpp_serial(struct nfp_cpp *cpp,\n+\t\tconst uint8_t **serial)\n {\n \t*serial = cpp->serial;\n \treturn cpp->serial_len;\n }\n \n int\n-nfp_cpp_serial_set(struct nfp_cpp *cpp, const uint8_t *serial,\n-\t\t   size_t serial_len)\n+nfp_cpp_serial_set(struct nfp_cpp *cpp,\n+\t\tconst uint8_t *serial,\n+\t\tsize_t serial_len)\n {\n \tif (cpp->serial_len)\n \t\tfree(cpp->serial);\n@@ -161,9 +166,11 @@ nfp_cpp_mu_locality_lsb(struct nfp_cpp *cpp)\n  * NOTE: @address and @size must be 32-bit aligned values.\n  */\n struct nfp_cpp_area *\n-nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp, uint32_t dest,\n-\t\t\t      const char *name, unsigned long long address,\n-\t\t\t      unsigned long size)\n+nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp,\n+\t\tuint32_t dest,\n+\t\tconst char *name,\n+\t\tunsigned long long address,\n+\t\tunsigned long size)\n {\n \tstruct nfp_cpp_area *area;\n \tuint64_t tmp64 = (uint64_t)address;\n@@ -183,7 +190,7 @@ nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp, uint32_t dest,\n \t\tname = \"\";\n \n \tarea = calloc(1, sizeof(*area) + cpp->op->area_priv_size +\n-\t\t      strlen(name) + 1);\n+\t\t\tstrlen(name) + 1);\n \tif (area == NULL)\n \t\treturn NULL;\n \n@@ -204,8 +211,10 @@ nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp, uint32_t dest,\n }\n \n struct nfp_cpp_area *\n-nfp_cpp_area_alloc(struct nfp_cpp *cpp, uint32_t dest,\n-\t\t    unsigned long long address, unsigned long size)\n+nfp_cpp_area_alloc(struct nfp_cpp *cpp,\n+\t\tuint32_t dest,\n+\t\tunsigned long long address,\n+\t\tunsigned long size)\n {\n \treturn nfp_cpp_area_alloc_with_name(cpp, dest, NULL, address, size);\n }\n@@ -226,8 +235,10 @@ nfp_cpp_area_alloc(struct nfp_cpp *cpp, uint32_t dest,\n  * NOTE: The area must also be 'released' when the structure is freed.\n  */\n struct nfp_cpp_area *\n-nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp, uint32_t destination,\n-\t\t\t    unsigned long long address, unsigned long size)\n+nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp,\n+\t\tuint32_t destination,\n+\t\tunsigned long long address,\n+\t\tunsigned long size)\n {\n \tstruct nfp_cpp_area *area;\n \n@@ -340,8 +351,10 @@ nfp_cpp_area_iomem(struct nfp_cpp_area *area)\n  * NOTE: Area must have been locked down with an 'acquire'.\n  */\n int\n-nfp_cpp_area_read(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t  void *kernel_vaddr, size_t length)\n+nfp_cpp_area_read(struct nfp_cpp_area *area,\n+\t\tunsigned long offset,\n+\t\tvoid *kernel_vaddr,\n+\t\tsize_t length)\n {\n \tif ((offset + length) > area->size)\n \t\treturn -EFAULT;\n@@ -364,8 +377,10 @@ nfp_cpp_area_read(struct nfp_cpp_area *area, unsigned long offset,\n  * NOTE: Area must have been locked down with an 'acquire'.\n  */\n int\n-nfp_cpp_area_write(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t   const void *kernel_vaddr, size_t length)\n+nfp_cpp_area_write(struct nfp_cpp_area *area,\n+\t\tunsigned long offset,\n+\t\tconst void *kernel_vaddr,\n+\t\tsize_t length)\n {\n \tif ((offset + length) > area->size)\n \t\treturn -EFAULT;\n@@ -392,8 +407,9 @@ nfp_cpp_area_mapped(struct nfp_cpp_area *area)\n  * or negative value on error.\n  */\n int\n-nfp_cpp_area_check_range(struct nfp_cpp_area *area, unsigned long long offset,\n-\t\t\t unsigned long length)\n+nfp_cpp_area_check_range(struct nfp_cpp_area *area,\n+\t\tunsigned long long offset,\n+\t\tunsigned long length)\n {\n \tif (((offset + length) > area->size))\n \t\treturn -EFAULT;\n@@ -406,7 +422,8 @@ nfp_cpp_area_check_range(struct nfp_cpp_area *area, unsigned long long offset,\n  * based upon NFP model.\n  */\n static uint32_t\n-nfp_xpb_to_cpp(struct nfp_cpp *cpp, uint32_t *xpb_addr)\n+nfp_xpb_to_cpp(struct nfp_cpp *cpp,\n+\t\tuint32_t *xpb_addr)\n {\n \tuint32_t xpb;\n \tint island;\n@@ -433,7 +450,7 @@ nfp_xpb_to_cpp(struct nfp_cpp *cpp, uint32_t *xpb_addr)\n \t\telse\n \t\t\t/* And only non-ARM interfaces use island id = 1 */\n \t\t\tif (NFP_CPP_INTERFACE_TYPE_of(nfp_cpp_interface(cpp)) !=\n-\t\t\t    NFP_CPP_INTERFACE_TYPE_ARM)\n+\t\t\t\t\tNFP_CPP_INTERFACE_TYPE_ARM)\n \t\t\t\t*xpb_addr |= (1 << 24);\n \t} else {\n \t\t(*xpb_addr) |= (1 << 30);\n@@ -443,8 +460,9 @@ nfp_xpb_to_cpp(struct nfp_cpp *cpp, uint32_t *xpb_addr)\n }\n \n int\n-nfp_cpp_area_readl(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t   uint32_t *value)\n+nfp_cpp_area_readl(struct nfp_cpp_area *area,\n+\t\tunsigned long offset,\n+\t\tuint32_t *value)\n {\n \tint sz;\n \tuint32_t tmp = 0;\n@@ -456,8 +474,9 @@ nfp_cpp_area_readl(struct nfp_cpp_area *area, unsigned long offset,\n }\n \n int\n-nfp_cpp_area_writel(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t    uint32_t value)\n+nfp_cpp_area_writel(struct nfp_cpp_area *area,\n+\t\tunsigned long offset,\n+\t\tuint32_t value)\n {\n \tint sz;\n \n@@ -467,8 +486,9 @@ nfp_cpp_area_writel(struct nfp_cpp_area *area, unsigned long offset,\n }\n \n int\n-nfp_cpp_area_readq(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t   uint64_t *value)\n+nfp_cpp_area_readq(struct nfp_cpp_area *area,\n+\t\tunsigned long offset,\n+\t\tuint64_t *value)\n {\n \tint sz;\n \tuint64_t tmp = 0;\n@@ -480,8 +500,9 @@ nfp_cpp_area_readq(struct nfp_cpp_area *area, unsigned long offset,\n }\n \n int\n-nfp_cpp_area_writeq(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t    uint64_t value)\n+nfp_cpp_area_writeq(struct nfp_cpp_area *area,\n+\t\tunsigned long offset,\n+\t\tuint64_t value)\n {\n \tint sz;\n \n@@ -492,8 +513,10 @@ nfp_cpp_area_writeq(struct nfp_cpp_area *area, unsigned long offset,\n }\n \n int\n-nfp_cpp_readl(struct nfp_cpp *cpp, uint32_t cpp_id, unsigned long long address,\n-\t      uint32_t *value)\n+nfp_cpp_readl(struct nfp_cpp *cpp,\n+\t\tuint32_t cpp_id,\n+\t\tunsigned long long address,\n+\t\tuint32_t *value)\n {\n \tint sz;\n \tuint32_t tmp;\n@@ -505,8 +528,10 @@ nfp_cpp_readl(struct nfp_cpp *cpp, uint32_t cpp_id, unsigned long long address,\n }\n \n int\n-nfp_cpp_writel(struct nfp_cpp *cpp, uint32_t cpp_id, unsigned long long address,\n-\t       uint32_t value)\n+nfp_cpp_writel(struct nfp_cpp *cpp,\n+\t\tuint32_t cpp_id,\n+\t\tunsigned long long address,\n+\t\tuint32_t value)\n {\n \tint sz;\n \n@@ -517,8 +542,10 @@ nfp_cpp_writel(struct nfp_cpp *cpp, uint32_t cpp_id, unsigned long long address,\n }\n \n int\n-nfp_cpp_readq(struct nfp_cpp *cpp, uint32_t cpp_id, unsigned long long address,\n-\t      uint64_t *value)\n+nfp_cpp_readq(struct nfp_cpp *cpp,\n+\t\tuint32_t cpp_id,\n+\t\tunsigned long long address,\n+\t\tuint64_t *value)\n {\n \tint sz;\n \tuint64_t tmp;\n@@ -530,8 +557,10 @@ nfp_cpp_readq(struct nfp_cpp *cpp, uint32_t cpp_id, unsigned long long address,\n }\n \n int\n-nfp_cpp_writeq(struct nfp_cpp *cpp, uint32_t cpp_id, unsigned long long address,\n-\t       uint64_t value)\n+nfp_cpp_writeq(struct nfp_cpp *cpp,\n+\t\tuint32_t cpp_id,\n+\t\tunsigned long long address,\n+\t\tuint64_t value)\n {\n \tint sz;\n \n@@ -542,7 +571,9 @@ nfp_cpp_writeq(struct nfp_cpp *cpp, uint32_t cpp_id, unsigned long long address,\n }\n \n int\n-nfp_xpb_writel(struct nfp_cpp *cpp, uint32_t xpb_addr, uint32_t value)\n+nfp_xpb_writel(struct nfp_cpp *cpp,\n+\t\tuint32_t xpb_addr,\n+\t\tuint32_t value)\n {\n \tuint32_t cpp_dest;\n \n@@ -552,7 +583,9 @@ nfp_xpb_writel(struct nfp_cpp *cpp, uint32_t xpb_addr, uint32_t value)\n }\n \n int\n-nfp_xpb_readl(struct nfp_cpp *cpp, uint32_t xpb_addr, uint32_t *value)\n+nfp_xpb_readl(struct nfp_cpp *cpp,\n+\t\tuint32_t xpb_addr,\n+\t\tuint32_t *value)\n {\n \tuint32_t cpp_dest;\n \n@@ -562,7 +595,8 @@ nfp_xpb_readl(struct nfp_cpp *cpp, uint32_t xpb_addr, uint32_t *value)\n }\n \n static struct nfp_cpp *\n-nfp_cpp_alloc(struct rte_pci_device *dev, int driver_lock_needed)\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@@ -596,7 +630,7 @@ nfp_cpp_alloc(struct rte_pci_device *dev, int driver_lock_needed)\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(uint32_t *)&cpp->imb_cat_table[tgt]);\n+\t\t\t\t\t(uint32_t *)&cpp->imb_cat_table[tgt]);\n \t\t\tif (err < 0) {\n \t\t\t\tfree(cpp);\n \t\t\t\treturn NULL;\n@@ -631,7 +665,8 @@ nfp_cpp_free(struct nfp_cpp *cpp)\n }\n \n struct nfp_cpp *\n-nfp_cpp_from_device_name(struct rte_pci_device *dev, int driver_lock_needed)\n+nfp_cpp_from_device_name(struct rte_pci_device *dev,\n+\t\tint driver_lock_needed)\n {\n \treturn nfp_cpp_alloc(dev, driver_lock_needed);\n }\n@@ -647,7 +682,9 @@ nfp_cpp_from_device_name(struct rte_pci_device *dev, int driver_lock_needed)\n  * @return 0 on success, or -1 on failure.\n  */\n int\n-nfp_xpb_writelm(struct nfp_cpp *cpp, uint32_t xpb_tgt, uint32_t mask,\n+nfp_xpb_writelm(struct nfp_cpp *cpp,\n+\t\tuint32_t xpb_tgt,\n+\t\tuint32_t mask,\n \t\tuint32_t value)\n {\n \tint err;\n@@ -674,8 +711,11 @@ nfp_xpb_writelm(struct nfp_cpp *cpp, uint32_t xpb_tgt, uint32_t mask,\n  * @return >= 0 on success, or negative value on failure.\n  */\n int\n-nfp_xpb_waitlm(struct nfp_cpp *cpp, uint32_t xpb_tgt, uint32_t mask,\n-\t       uint32_t value, int timeout_us)\n+nfp_xpb_waitlm(struct nfp_cpp *cpp,\n+\t\tuint32_t xpb_tgt,\n+\t\tuint32_t mask,\n+\t\tuint32_t value,\n+\t\tint timeout_us)\n {\n \tuint32_t tmp;\n \tint err;\n@@ -716,8 +756,11 @@ nfp_xpb_waitlm(struct nfp_cpp *cpp, uint32_t xpb_tgt, uint32_t mask,\n  * @length:     number of bytes to read\n  */\n int\n-nfp_cpp_read(struct nfp_cpp *cpp, uint32_t destination,\n-\t     unsigned long long address, void *kernel_vaddr, size_t length)\n+nfp_cpp_read(struct nfp_cpp *cpp,\n+\t\tuint32_t destination,\n+\t\tunsigned long long address,\n+\t\tvoid *kernel_vaddr,\n+\t\tsize_t length)\n {\n \tstruct nfp_cpp_area *area;\n \tint err;\n@@ -743,9 +786,11 @@ nfp_cpp_read(struct nfp_cpp *cpp, uint32_t destination,\n  * @length:     number of bytes to write\n  */\n int\n-nfp_cpp_write(struct nfp_cpp *cpp, uint32_t destination,\n-\t      unsigned long long address, const void *kernel_vaddr,\n-\t      size_t length)\n+nfp_cpp_write(struct nfp_cpp *cpp,\n+\t\tuint32_t destination,\n+\t\tunsigned long long address,\n+\t\tconst void *kernel_vaddr,\n+\t\tsize_t length)\n {\n \tstruct nfp_cpp_area *area;\n \tint err;\n@@ -768,8 +813,10 @@ nfp_cpp_write(struct nfp_cpp *cpp, uint32_t destination,\n  * @length:     length of area to fill\n  */\n int\n-nfp_cpp_area_fill(struct nfp_cpp_area *area, unsigned long offset,\n-\t\t  uint32_t value, size_t length)\n+nfp_cpp_area_fill(struct nfp_cpp_area *area,\n+\t\tunsigned long offset,\n+\t\tuint32_t value,\n+\t\tsize_t length)\n {\n \tint err;\n \tsize_t i;\n@@ -795,9 +842,8 @@ nfp_cpp_area_fill(struct nfp_cpp_area *area, unsigned long offset,\n \t}\n \n \tfor (i = 0; (i + sizeof(value)) < length; i += sizeof(value64)) {\n-\t\terr =\n-\t\t    nfp_cpp_area_write(area, offset + i, &value64,\n-\t\t\t\t       sizeof(value64));\n+\t\terr = nfp_cpp_area_write(area, offset + i, &value64,\n+\t\t\t\tsizeof(value64));\n \t\tif (err < 0)\n \t\t\treturn err;\n \t\tif (err != sizeof(value64))\n@@ -805,8 +851,7 @@ nfp_cpp_area_fill(struct nfp_cpp_area *area, unsigned long offset,\n \t}\n \n \tif ((i + sizeof(value)) <= length) {\n-\t\terr =\n-\t\t    nfp_cpp_area_write(area, offset + i, &value, sizeof(value));\n+\t\terr = nfp_cpp_area_write(area, offset + i, &value, sizeof(value));\n \t\tif (err < 0)\n \t\t\treturn err;\n \t\tif (err != sizeof(value))\n@@ -822,13 +867,14 @@ nfp_cpp_area_fill(struct nfp_cpp_area *area, unsigned long offset,\n  * as those are model-specific\n  */\n uint32_t\n-__nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model)\n+__nfp_cpp_model_autodetect(struct nfp_cpp *cpp,\n+\t\tuint32_t *model)\n {\n \tuint32_t reg;\n \tint err;\n \n \terr = nfp_xpb_readl(cpp, NFP_XPB_DEVICE(1, 1, 16) + NFP_PL_DEVICE_ID,\n-\t\t\t    &reg);\n+\t\t\t&reg);\n \tif (err < 0)\n \t\treturn err;\n \n@@ -853,8 +899,11 @@ __nfp_cpp_model_autodetect(struct nfp_cpp *cpp, uint32_t *model)\n  * Return: Pointer to memory mapped area or NULL\n  */\n uint8_t *\n-nfp_cpp_map_area(struct nfp_cpp *cpp, uint32_t cpp_id, uint64_t addr,\n-\t\t unsigned long size, struct nfp_cpp_area **area)\n+nfp_cpp_map_area(struct nfp_cpp *cpp,\n+\t\tuint32_t cpp_id,\n+\t\tuint64_t addr,\n+\t\tunsigned long size,\n+\t\tstruct nfp_cpp_area **area)\n {\n \tuint8_t *res;\n \ndiff --git a/drivers/net/nfp/nfpcore/nfp_hwinfo.c b/drivers/net/nfp/nfpcore/nfp_hwinfo.c\nindex a9d166c4dc..ea4c7d6a9e 100644\n--- a/drivers/net/nfp/nfpcore/nfp_hwinfo.c\n+++ b/drivers/net/nfp/nfpcore/nfp_hwinfo.c\n@@ -33,12 +33,13 @@ nfp_hwinfo_is_updating(struct nfp_hwinfo *hwinfo)\n }\n \n static int\n-nfp_hwinfo_db_walk(struct nfp_hwinfo *hwinfo, uint32_t size)\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 \n \tfor (key = hwinfo->data; *key != 0 && key < end;\n-\t     key = val + strlen(val) + 1) {\n+\t\t\tkey = val + strlen(val) + 1) {\n \t\tval = key + strlen(key) + 1;\n \t\tif (val >= end) {\n \t\t\tPMD_DRV_LOG(ERR, \"Bad HWINFO - overflowing value\");\n@@ -54,7 +55,8 @@ nfp_hwinfo_db_walk(struct nfp_hwinfo *hwinfo, uint32_t size)\n }\n \n static int\n-nfp_hwinfo_db_validate(struct nfp_hwinfo *db, uint32_t len)\n+nfp_hwinfo_db_validate(struct nfp_hwinfo *db,\n+\t\tuint32_t len)\n {\n \tuint32_t size, new_crc, *crc;\n \n@@ -69,7 +71,7 @@ nfp_hwinfo_db_validate(struct nfp_hwinfo *db, uint32_t len)\n \tcrc = (uint32_t *)(db->start + size);\n \tif (new_crc != *crc) {\n \t\tPMD_DRV_LOG(ERR, \"Corrupt hwinfo table (CRC mismatch) calculated 0x%x, expected 0x%x\",\n-\t\t\t    new_crc, *crc);\n+\t\t\t\tnew_crc, *crc);\n \t\treturn -EINVAL;\n \t}\n \n@@ -77,7 +79,8 @@ nfp_hwinfo_db_validate(struct nfp_hwinfo *db, uint32_t len)\n }\n \n static struct nfp_hwinfo *\n-nfp_hwinfo_try_fetch(struct nfp_cpp *cpp, size_t *cpp_size)\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@@ -115,7 +118,7 @@ nfp_hwinfo_try_fetch(struct nfp_cpp *cpp, size_t *cpp_size)\n \n \tif (header->version != NFP_HWINFO_VERSION_2) {\n \t\tPMD_DRV_LOG(DEBUG, \"Unknown HWInfo version: 0x%08x\",\n-\t\t\theader->version);\n+\t\t\t\theader->version);\n \t\tgoto exit_free;\n \t}\n \n@@ -129,7 +132,8 @@ nfp_hwinfo_try_fetch(struct nfp_cpp *cpp, size_t *cpp_size)\n }\n \n static struct nfp_hwinfo *\n-nfp_hwinfo_fetch(struct nfp_cpp *cpp, size_t *hwdb_size)\n+nfp_hwinfo_fetch(struct nfp_cpp *cpp,\n+\t\tsize_t *hwdb_size)\n {\n \tstruct timespec wait;\n \tstruct nfp_hwinfo *db;\n@@ -179,7 +183,8 @@ nfp_hwinfo_read(struct nfp_cpp *cpp)\n  * Return: Value of the HWInfo name, or NULL\n  */\n const char *\n-nfp_hwinfo_lookup(struct nfp_hwinfo *hwinfo, const char *lookup)\n+nfp_hwinfo_lookup(struct nfp_hwinfo *hwinfo,\n+\t\tconst char *lookup)\n {\n \tconst char *key, *val, *end;\n \n@@ -189,7 +194,7 @@ nfp_hwinfo_lookup(struct nfp_hwinfo *hwinfo, const char *lookup)\n \tend = hwinfo->data + hwinfo->size - sizeof(uint32_t);\n \n \tfor (key = hwinfo->data; *key != 0 && key < end;\n-\t     key = val + strlen(val) + 1) {\n+\t\t\tkey = val + strlen(val) + 1) {\n \t\tval = key + strlen(key) + 1;\n \n \t\tif (strcmp(key, lookup) == 0)\ndiff --git a/drivers/net/nfp/nfpcore/nfp_mip.c b/drivers/net/nfp/nfpcore/nfp_mip.c\nindex f9723dd136..0071d3fc37 100644\n--- a/drivers/net/nfp/nfpcore/nfp_mip.c\n+++ b/drivers/net/nfp/nfpcore/nfp_mip.c\n@@ -37,8 +37,10 @@ struct nfp_mip {\n \n /* Read memory and check if it could be a valid MIP */\n static int\n-nfp_mip_try_read(struct nfp_cpp *cpp, uint32_t cpp_id, uint64_t addr,\n-\t\t struct nfp_mip *mip)\n+nfp_mip_try_read(struct nfp_cpp *cpp,\n+\t\tuint32_t cpp_id,\n+\t\tuint64_t addr,\n+\t\tstruct nfp_mip *mip)\n {\n \tint ret;\n \n@@ -49,12 +51,12 @@ nfp_mip_try_read(struct nfp_cpp *cpp, uint32_t cpp_id, uint64_t addr,\n \t}\n \tif (mip->signature != NFP_MIP_SIGNATURE) {\n \t\tPMD_DRV_LOG(ERR, \"Incorrect MIP signature (0x%08x)\",\n-\t\t\t    rte_le_to_cpu_32(mip->signature));\n+\t\t\t\trte_le_to_cpu_32(mip->signature));\n \t\treturn -EINVAL;\n \t}\n \tif (mip->mip_version != NFP_MIP_VERSION) {\n \t\tPMD_DRV_LOG(ERR, \"Unsupported MIP version (%d)\",\n-\t\t\t    rte_le_to_cpu_32(mip->mip_version));\n+\t\t\t\trte_le_to_cpu_32(mip->mip_version));\n \t\treturn -EINVAL;\n \t}\n \n@@ -63,7 +65,8 @@ nfp_mip_try_read(struct nfp_cpp *cpp, uint32_t cpp_id, uint64_t addr,\n \n /* Try to locate MIP using the resource table */\n static int\n-nfp_mip_read_resource(struct nfp_cpp *cpp, struct nfp_mip *mip)\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@@ -134,7 +137,9 @@ nfp_mip_name(const struct nfp_mip *mip)\n  * @size:\tLocation for size of MIP symbol table\n  */\n void\n-nfp_mip_symtab(const struct nfp_mip *mip, uint32_t *addr, uint32_t *size)\n+nfp_mip_symtab(const struct nfp_mip *mip,\n+\t\tuint32_t *addr,\n+\t\tuint32_t *size)\n {\n \t*addr = rte_le_to_cpu_32(mip->symtab_addr);\n \t*size = rte_le_to_cpu_32(mip->symtab_size);\n@@ -147,7 +152,9 @@ nfp_mip_symtab(const struct nfp_mip *mip, uint32_t *addr, uint32_t *size)\n  * @size:\tLocation for size of MIP symbol name table\n  */\n void\n-nfp_mip_strtab(const struct nfp_mip *mip, uint32_t *addr, uint32_t *size)\n+nfp_mip_strtab(const struct nfp_mip *mip,\n+\t\tuint32_t *addr,\n+\t\tuint32_t *size)\n {\n \t*addr = rte_le_to_cpu_32(mip->strtab_addr);\n \t*size = rte_le_to_cpu_32(mip->strtab_size);\ndiff --git a/drivers/net/nfp/nfpcore/nfp_mip.h b/drivers/net/nfp/nfpcore/nfp_mip.h\nindex d0919b58fe..980abc2517 100644\n--- a/drivers/net/nfp/nfpcore/nfp_mip.h\n+++ b/drivers/net/nfp/nfpcore/nfp_mip.h\n@@ -17,5 +17,5 @@ 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\t\t    uint64_t *off);\n+\t\tuint64_t *off);\n #endif\ndiff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c\nindex 0410a00856..047e755416 100644\n--- a/drivers/net/nfp/nfpcore/nfp_mutex.c\n+++ b/drivers/net/nfp/nfpcore/nfp_mutex.c\n@@ -35,7 +35,9 @@ struct nfp_cpp_mutex {\n };\n \n static int\n-_nfp_cpp_mutex_validate(uint32_t model, int *target, unsigned long long address)\n+_nfp_cpp_mutex_validate(uint32_t model,\n+\t\tint *target,\n+\t\tunsigned long long address)\n {\n \t/* Address must be 64-bit aligned */\n \tif ((address & 7) != 0)\n@@ -72,8 +74,10 @@ _nfp_cpp_mutex_validate(uint32_t model, int *target, unsigned long long address)\n  * @return 0 on success, or negative value on failure.\n  */\n int\n-nfp_cpp_mutex_init(struct nfp_cpp *cpp, int target, unsigned long long address,\n-\t\t   uint32_t key)\n+nfp_cpp_mutex_init(struct nfp_cpp *cpp,\n+\t\tint target,\n+\t\tunsigned long long address,\n+\t\tuint32_t key)\n {\n \tuint32_t model = nfp_cpp_model(cpp);\n \tuint32_t muw = NFP_CPP_ID(target, 4, 0);\t/* atomic_write */\n@@ -87,9 +91,8 @@ nfp_cpp_mutex_init(struct nfp_cpp *cpp, int target, unsigned long long address,\n \tif (err < 0)\n \t\treturn err;\n \n-\terr =\n-\t    nfp_cpp_writel(cpp, muw, address + 0,\n-\t\t\t   MUTEX_LOCKED(nfp_cpp_interface(cpp)));\n+\terr = nfp_cpp_writel(cpp, muw, address + 0,\n+\t\t\tMUTEX_LOCKED(nfp_cpp_interface(cpp)));\n \tif (err < 0)\n \t\treturn err;\n \n@@ -114,8 +117,10 @@ nfp_cpp_mutex_init(struct nfp_cpp *cpp, int target, unsigned long long address,\n  * @return      A non-NULL struct nfp_cpp_mutex * on success, NULL on failure.\n  */\n struct nfp_cpp_mutex *\n-nfp_cpp_mutex_alloc(struct nfp_cpp *cpp, int target,\n-\t\t     unsigned long long address, uint32_t key)\n+nfp_cpp_mutex_alloc(struct nfp_cpp *cpp,\n+\t\tint target,\n+\t\tunsigned long long address,\n+\t\tuint32_t key)\n {\n \tuint32_t model = nfp_cpp_model(cpp);\n \tstruct nfp_cpp_mutex *mutex;\n@@ -265,8 +270,8 @@ nfp_cpp_mutex_lock(struct nfp_cpp_mutex *mutex)\n \t\t\treturn err;\n \t\tif (time(NULL) >= warn_at) {\n \t\t\tPMD_DRV_LOG(ERR, \"Warning: waiting for NFP mutex usage:%u depth:%hd] target:%d addr:%llx key:%08x]\",\n-\t\t\t\t    mutex->usage, mutex->depth, mutex->target,\n-\t\t\t\t    mutex->address, mutex->key);\n+\t\t\t\t\tmutex->usage, mutex->depth, mutex->target,\n+\t\t\t\t\tmutex->address, mutex->key);\n \t\t\twarn_at = time(NULL) + 60;\n \t\t}\n \t\tsched_yield();\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c\nindex 433780a5e7..8bdc69766e 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nffw.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nffw.c\n@@ -138,8 +138,8 @@ nfp_nffw_info_open(struct nfp_cpp *cpp)\n \t\tgoto err_release;\n \n \terr = nfp_cpp_read(cpp, nfp_resource_cpp_id(state->res),\n-\t\t\t   nfp_resource_address(state->res),\n-\t\t\t   fwinf, sizeof(*fwinf));\n+\t\t\tnfp_resource_address(state->res),\n+\t\t\tfwinf, sizeof(*fwinf));\n \tif (err < (int)sizeof(*fwinf))\n \t\tgoto err_release;\n \n@@ -205,8 +205,9 @@ nfp_nffw_info_fwid_first(struct nfp_nffw_info *state)\n  * Return: 0, or -ERRNO\n  */\n int\n-nfp_nffw_info_mip_first(struct nfp_nffw_info *state, uint32_t *cpp_id,\n-\t\t\tuint64_t *off)\n+nfp_nffw_info_mip_first(struct nfp_nffw_info *state,\n+\t\tuint32_t *cpp_id,\n+\t\tuint64_t *off)\n {\n \tstruct nffw_fwinfo *fwinfo;\n \ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c\nindex 6474abf0c2..4f476f6f2b 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp.c\n@@ -22,7 +22,8 @@ nfp_nsp_config_modified(struct nfp_nsp *state)\n }\n \n void\n-nfp_nsp_config_set_modified(struct nfp_nsp *state, int modified)\n+nfp_nsp_config_set_modified(struct nfp_nsp *state,\n+\t\tint modified)\n {\n \tstate->modified = modified;\n }\n@@ -40,7 +41,9 @@ nfp_nsp_config_idx(struct nfp_nsp *state)\n }\n \n void\n-nfp_nsp_config_set_state(struct nfp_nsp *state, void *entries, unsigned int idx)\n+nfp_nsp_config_set_state(struct nfp_nsp *state,\n+\t\tvoid *entries,\n+\t\tunsigned int idx)\n {\n \tstate->entries = entries;\n \tstate->idx = idx;\n@@ -91,7 +94,7 @@ nfp_nsp_check(struct nfp_nsp *state)\n \n \tif (state->ver.major != NSP_MAJOR || state->ver.minor < NSP_MINOR) {\n \t\tPMD_DRV_LOG(ERR, \"Unsupported ABI %hu.%hu\", state->ver.major,\n-\t\t\t\t\t\t    state->ver.minor);\n+\t\t\t\tstate->ver.minor);\n \t\treturn -EINVAL;\n \t}\n \n@@ -160,8 +163,12 @@ nfp_nsp_get_abi_ver_minor(struct nfp_nsp *state)\n }\n \n static int\n-nfp_nsp_wait_reg(struct nfp_cpp *cpp, uint64_t *reg, uint32_t nsp_cpp,\n-\t\t uint64_t addr, uint64_t mask, uint64_t val)\n+nfp_nsp_wait_reg(struct nfp_cpp *cpp,\n+\t\tuint64_t *reg,\n+\t\tuint32_t nsp_cpp,\n+\t\tuint64_t addr,\n+\t\tuint64_t mask,\n+\t\tuint64_t val)\n {\n \tstruct timespec wait;\n \tint count;\n@@ -204,8 +211,11 @@ nfp_nsp_wait_reg(struct nfp_cpp *cpp, uint64_t *reg, uint32_t nsp_cpp,\n  *\t-ETIMEDOUT if the NSP took longer than 30 seconds to complete\n  */\n static int\n-nfp_nsp_command(struct nfp_nsp *state, uint16_t code, uint32_t option,\n-\t\tuint32_t buff_cpp, uint64_t buff_addr)\n+nfp_nsp_command(struct nfp_nsp *state,\n+\t\tuint16_t code,\n+\t\tuint32_t option,\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@@ -223,40 +233,40 @@ nfp_nsp_command(struct nfp_nsp *state, uint16_t code, uint32_t option,\n \t\treturn err;\n \n \tif (!FIELD_FIT(NSP_BUFFER_CPP, buff_cpp >> 8) ||\n-\t    !FIELD_FIT(NSP_BUFFER_ADDRESS, buff_addr)) {\n+\t\t\t!FIELD_FIT(NSP_BUFFER_ADDRESS, buff_addr)) {\n \t\tPMD_DRV_LOG(ERR, \"Host buffer out of reach %08x %\" PRIx64,\n-\t\t\tbuff_cpp, buff_addr);\n+\t\t\t\tbuff_cpp, buff_addr);\n \t\treturn -EINVAL;\n \t}\n \n \terr = nfp_cpp_writeq(cpp, nsp_cpp, nsp_buffer,\n-\t\t\t     FIELD_PREP(NSP_BUFFER_CPP, buff_cpp >> 8) |\n-\t\t\t     FIELD_PREP(NSP_BUFFER_ADDRESS, buff_addr));\n+\t\t\tFIELD_PREP(NSP_BUFFER_CPP, buff_cpp >> 8) |\n+\t\t\tFIELD_PREP(NSP_BUFFER_ADDRESS, buff_addr));\n \tif (err < 0)\n \t\treturn err;\n \n \terr = nfp_cpp_writeq(cpp, nsp_cpp, nsp_command,\n-\t\t\t     FIELD_PREP(NSP_COMMAND_OPTION, option) |\n-\t\t\t     FIELD_PREP(NSP_COMMAND_CODE, code) |\n-\t\t\t     FIELD_PREP(NSP_COMMAND_START, 1));\n+\t\t\tFIELD_PREP(NSP_COMMAND_OPTION, option) |\n+\t\t\tFIELD_PREP(NSP_COMMAND_CODE, code) |\n+\t\t\tFIELD_PREP(NSP_COMMAND_START, 1));\n \tif (err < 0)\n \t\treturn err;\n \n \t/* Wait for NSP_COMMAND_START to go to 0 */\n \terr = nfp_nsp_wait_reg(cpp, &reg, nsp_cpp, nsp_command,\n-\t\t\t       NSP_COMMAND_START, 0);\n+\t\t\tNSP_COMMAND_START, 0);\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\t\t\terr, code);\n \t\treturn err;\n \t}\n \n \t/* Wait for NSP_STATUS_BUSY to go to 0 */\n-\terr = nfp_nsp_wait_reg(cpp, &reg, nsp_cpp, nsp_status, NSP_STATUS_BUSY,\n-\t\t\t       0);\n+\terr = nfp_nsp_wait_reg(cpp, &reg, nsp_cpp, nsp_status,\n+\t\t\tNSP_STATUS_BUSY, 0);\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\t\t\terr, code);\n \t\treturn err;\n \t}\n \n@@ -268,7 +278,7 @@ nfp_nsp_command(struct nfp_nsp *state, uint16_t code, uint32_t option,\n \terr = FIELD_GET(NSP_STATUS_RESULT, reg);\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\t\t\t-err, (int)ret_val, code);\n \t\tnfp_nsp_print_extended_error(ret_val);\n \t\treturn -err;\n \t}\n@@ -279,9 +289,12 @@ nfp_nsp_command(struct nfp_nsp *state, uint16_t code, uint32_t option,\n #define SZ_1M 0x00100000\n \n static int\n-nfp_nsp_command_buf(struct nfp_nsp *nsp, uint16_t code, uint32_t option,\n-\t\t    const void *in_buf, unsigned int in_size, void *out_buf,\n-\t\t    unsigned int out_size)\n+nfp_nsp_command_buf(struct nfp_nsp *nsp,\n+\t\tuint16_t code, uint32_t option,\n+\t\tconst void *in_buf,\n+\t\tunsigned int in_size,\n+\t\tvoid *out_buf,\n+\t\tunsigned int out_size)\n {\n \tstruct nfp_cpp *cpp = nsp->cpp;\n \tunsigned int max_size;\n@@ -291,28 +304,26 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp, uint16_t code, uint32_t option,\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-\t\t\t    code, nsp->ver.major, nsp->ver.minor);\n+\t\t\t\tcode, nsp->ver.major, nsp->ver.minor);\n \t\treturn -EOPNOTSUPP;\n \t}\n \n \terr = nfp_cpp_readq(cpp, nfp_resource_cpp_id(nsp->res),\n-\t\t\t    nfp_resource_address(nsp->res) +\n-\t\t\t    NSP_DFLT_BUFFER_CONFIG,\n-\t\t\t    &reg);\n+\t\t\tnfp_resource_address(nsp->res) + NSP_DFLT_BUFFER_CONFIG,\n+\t\t\t&reg);\n \tif (err < 0)\n \t\treturn err;\n \n \tmax_size = RTE_MAX(in_size, out_size);\n \tif (FIELD_GET(NSP_DFLT_BUFFER_SIZE_MB, reg) * SZ_1M < max_size) {\n \t\tPMD_DRV_LOG(ERR, \"NSP: default buffer too small for command 0x%04x (%llu < %u)\",\n-\t\t\t    code, FIELD_GET(NSP_DFLT_BUFFER_SIZE_MB, reg) * SZ_1M, max_size);\n+\t\t\t\tcode, FIELD_GET(NSP_DFLT_BUFFER_SIZE_MB, reg) * SZ_1M, max_size);\n \t\treturn -EINVAL;\n \t}\n \n \terr = nfp_cpp_readq(cpp, nfp_resource_cpp_id(nsp->res),\n-\t\t\t    nfp_resource_address(nsp->res) +\n-\t\t\t    NSP_DFLT_BUFFER,\n-\t\t\t    &reg);\n+\t\t\tnfp_resource_address(nsp->res) + NSP_DFLT_BUFFER,\n+\t\t\t&reg);\n \tif (err < 0)\n \t\treturn err;\n \n@@ -328,7 +339,7 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp, uint16_t code, uint32_t option,\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+\t\t\t\tout_size - in_size);\n \t\tif (err < 0)\n \t\t\treturn err;\n \t}\n@@ -388,38 +399,47 @@ nfp_nsp_mac_reinit(struct nfp_nsp *state)\n }\n \n int\n-nfp_nsp_load_fw(struct nfp_nsp *state, void *buf, unsigned int size)\n+nfp_nsp_load_fw(struct nfp_nsp *state,\n+\t\tvoid *buf,\n+\t\tunsigned int size)\n {\n \treturn nfp_nsp_command_buf(state, SPCODE_FW_LOAD, size, buf, size,\n-\t\t\t\t   NULL, 0);\n+\t\t\tNULL, 0);\n }\n \n int\n-nfp_nsp_read_eth_table(struct nfp_nsp *state, void *buf, unsigned int size)\n+nfp_nsp_read_eth_table(struct nfp_nsp *state,\n+\t\tvoid *buf,\n+\t\tunsigned int size)\n {\n \treturn nfp_nsp_command_buf(state, SPCODE_ETH_RESCAN, size, NULL, 0,\n-\t\t\t\t   buf, size);\n+\t\t\tbuf, size);\n }\n \n int\n-nfp_nsp_write_eth_table(struct nfp_nsp *state, const void *buf,\n-\t\t\tunsigned int size)\n+nfp_nsp_write_eth_table(struct nfp_nsp *state,\n+\t\tconst void *buf,\n+\t\tunsigned int size)\n {\n \treturn nfp_nsp_command_buf(state, SPCODE_ETH_CONTROL, size, buf, size,\n-\t\t\t\t   NULL, 0);\n+\t\t\tNULL, 0);\n }\n \n int\n-nfp_nsp_read_identify(struct nfp_nsp *state, void *buf, unsigned int size)\n+nfp_nsp_read_identify(struct nfp_nsp *state,\n+\t\tvoid *buf,\n+\t\tunsigned int size)\n {\n \treturn nfp_nsp_command_buf(state, SPCODE_NSP_IDENTIFY, size, NULL, 0,\n-\t\t\t\t   buf, size);\n+\t\t\tbuf, size);\n }\n \n int\n-nfp_nsp_read_sensors(struct nfp_nsp *state, unsigned int sensor_mask, void *buf,\n-\t\t     unsigned int size)\n+nfp_nsp_read_sensors(struct nfp_nsp *state,\n+\t\tunsigned int sensor_mask,\n+\t\tvoid *buf,\n+\t\tunsigned int size)\n {\n \treturn nfp_nsp_command_buf(state, SPCODE_NSP_SENSORS, sensor_mask, NULL,\n-\t\t\t\t   0, buf, size);\n+\t\t\t0, buf, size);\n }\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp.h b/drivers/net/nfp/nfpcore/nfp_nsp.h\nindex 9905b2d3d3..1e2deaabb4 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp.h\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp.h\n@@ -114,9 +114,10 @@ int nfp_nsp_load_fw(struct nfp_nsp *state, void *buf, unsigned int size);\n int nfp_nsp_mac_reinit(struct nfp_nsp *state);\n int nfp_nsp_read_identify(struct nfp_nsp *state, void *buf, unsigned int size);\n int nfp_nsp_read_sensors(struct nfp_nsp *state, unsigned int sensor_mask,\n-\t\t\t void *buf, unsigned int size);\n+\t\tvoid *buf, unsigned int size);\n \n-static inline int nfp_nsp_has_mac_reinit(struct nfp_nsp *state)\n+static inline int\n+nfp_nsp_has_mac_reinit(struct nfp_nsp *state)\n {\n \treturn nfp_nsp_get_abi_ver_minor(state) > 20;\n }\n@@ -229,22 +230,22 @@ struct nfp_eth_table *nfp_eth_read_ports(struct nfp_cpp *cpp);\n \n int nfp_eth_set_mod_enable(struct nfp_cpp *cpp, unsigned int idx, int enable);\n int nfp_eth_set_configured(struct nfp_cpp *cpp, unsigned int idx,\n-\t\t\t   int configed);\n-int\n-nfp_eth_set_fec(struct nfp_cpp *cpp, unsigned int idx, enum nfp_eth_fec mode);\n+\t\tint configed);\n+int nfp_eth_set_fec(struct nfp_cpp *cpp, unsigned int idx, enum nfp_eth_fec mode);\n \n int nfp_nsp_read_eth_table(struct nfp_nsp *state, void *buf, unsigned int size);\n int nfp_nsp_write_eth_table(struct nfp_nsp *state, const void *buf,\n-\t\t\t    unsigned int size);\n+\t\tunsigned int size);\n void nfp_nsp_config_set_state(struct nfp_nsp *state, void *entries,\n-\t\t\t      unsigned int idx);\n+\t\tunsigned int idx);\n void nfp_nsp_config_clear_state(struct nfp_nsp *state);\n void nfp_nsp_config_set_modified(struct nfp_nsp *state, int modified);\n void *nfp_nsp_config_entries(struct nfp_nsp *state);\n int nfp_nsp_config_modified(struct nfp_nsp *state);\n unsigned int nfp_nsp_config_idx(struct nfp_nsp *state);\n \n-static inline int nfp_eth_can_support_fec(struct nfp_eth_table_port *eth_port)\n+static inline int\n+nfp_eth_can_support_fec(struct nfp_eth_table_port *eth_port)\n {\n \treturn !!eth_port->fec_modes_supported;\n }\n@@ -297,6 +298,6 @@ enum nfp_nsp_sensor_id {\n };\n \n int nfp_hwmon_read_sensor(struct nfp_cpp *cpp, enum nfp_nsp_sensor_id id,\n-\t\t\t  long *val);\n+\t\tlong *val);\n \n #endif\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\nindex 21b338461e..28dba27124 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp_cmds.c\n@@ -73,7 +73,9 @@ struct nfp_sensors {\n };\n \n int\n-nfp_hwmon_read_sensor(struct nfp_cpp *cpp, enum nfp_nsp_sensor_id id, long *val)\n+nfp_hwmon_read_sensor(struct nfp_cpp *cpp,\n+\t\tenum nfp_nsp_sensor_id id,\n+\t\tlong *val)\n {\n \tstruct nfp_sensors s;\n \tstruct nfp_nsp *nsp;\ndiff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\nindex 825a84a8cd..3eeefc74af 100644\n--- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n+++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c\n@@ -168,8 +168,10 @@ nfp_eth_copy_mac_reverse(uint8_t *dst, const uint8_t *src)\n }\n \n static void\n-nfp_eth_port_translate(struct nfp_nsp *nsp, const union eth_table_entry *src,\n-\t\t       unsigned int index, struct nfp_eth_table_port *dst)\n+nfp_eth_port_translate(struct nfp_nsp *nsp,\n+\t\tconst union eth_table_entry *src,\n+\t\tunsigned int index,\n+\t\tstruct nfp_eth_table_port *dst)\n {\n \tunsigned int rate;\n \tunsigned int fec;\n@@ -225,21 +227,21 @@ nfp_eth_calc_port_geometry(struct nfp_eth_table *table)\n \n \tfor (i = 0; i < table->count; i++) {\n \t\ttable->max_index = RTE_MAX(table->max_index,\n-\t\t\t\t\t   table->ports[i].index);\n+\t\t\t\ttable->ports[i].index);\n \n \t\tfor (j = 0; j < table->count; j++) {\n \t\t\tif (table->ports[i].label_port !=\n-\t\t\t    table->ports[j].label_port)\n+\t\t\t\t\ttable->ports[j].label_port)\n \t\t\t\tcontinue;\n \t\t\ttable->ports[i].port_lanes += table->ports[j].lanes;\n \n \t\t\tif (i == j)\n \t\t\t\tcontinue;\n \t\t\tif (table->ports[i].label_subport ==\n-\t\t\t    table->ports[j].label_subport)\n+\t\t\t\t\ttable->ports[j].label_subport)\n \t\t\t\tPMD_DRV_LOG(DEBUG, \"Port %d subport %d is a duplicate\",\n-\t\t\t\t\t table->ports[i].label_port,\n-\t\t\t\t\t table->ports[i].label_subport);\n+\t\t\t\t\t\ttable->ports[i].label_port,\n+\t\t\t\t\t\ttable->ports[i].label_subport);\n \n \t\t\ttable->ports[i].is_split = 1;\n \t\t}\n@@ -296,7 +298,7 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp)\n \t */\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\t\t\tret, cnt);\n \t\tgoto err;\n \t}\n \n@@ -354,7 +356,8 @@ nfp_eth_read_ports(struct nfp_cpp *cpp)\n }\n \n struct nfp_nsp *\n-nfp_eth_config_start(struct nfp_cpp *cpp, unsigned int idx)\n+nfp_eth_config_start(struct nfp_cpp *cpp,\n+\t\tunsigned int idx)\n {\n \tunion eth_table_entry *entries;\n \tstruct nfp_nsp *nsp;\n@@ -447,7 +450,9 @@ nfp_eth_config_commit_end(struct nfp_nsp *nsp)\n  * -ERRNO - configuration failed.\n  */\n int\n-nfp_eth_set_mod_enable(struct nfp_cpp *cpp, unsigned int idx, int enable)\n+nfp_eth_set_mod_enable(struct nfp_cpp *cpp,\n+\t\tunsigned int idx,\n+\t\tint enable)\n {\n \tunion eth_table_entry *entries;\n \tstruct nfp_nsp *nsp;\n@@ -487,7 +492,9 @@ nfp_eth_set_mod_enable(struct nfp_cpp *cpp, unsigned int idx, int enable)\n  * -ERRNO - configuration failed.\n  */\n int\n-nfp_eth_set_configured(struct nfp_cpp *cpp, unsigned int idx, int configed)\n+nfp_eth_set_configured(struct nfp_cpp *cpp,\n+\t\tunsigned int idx,\n+\t\tint configed)\n {\n \tunion eth_table_entry *entries;\n \tstruct nfp_nsp *nsp;\n@@ -523,9 +530,12 @@ nfp_eth_set_configured(struct nfp_cpp *cpp, unsigned int idx, int configed)\n }\n \n static int\n-nfp_eth_set_bit_config(struct nfp_nsp *nsp, unsigned int raw_idx,\n-\t\t       const uint64_t mask, const unsigned int shift,\n-\t\t       unsigned int val, const uint64_t ctrl_bit)\n+nfp_eth_set_bit_config(struct nfp_nsp *nsp,\n+\t\tunsigned int raw_idx,\n+\t\tconst uint64_t mask,\n+\t\tconst unsigned int shift,\n+\t\tunsigned int val,\n+\t\tconst uint64_t ctrl_bit)\n {\n \tunion eth_table_entry *entries = nfp_nsp_config_entries(nsp);\n \tunsigned int idx = nfp_nsp_config_idx(nsp);\n@@ -560,7 +570,7 @@ nfp_eth_set_bit_config(struct nfp_nsp *nsp, unsigned int raw_idx,\n \t(__extension__ ({ \\\n \t\ttypeof(mask) _x = (mask); \\\n \t\tnfp_eth_set_bit_config(nsp, raw_idx, _x, __bf_shf(_x), \\\n-\t\t\t\t       val, ctrl_bit);\t\t\t\\\n+\t\t\t\tval, ctrl_bit);\t\t\t\\\n \t}))\n \n /*\n@@ -574,11 +584,11 @@ nfp_eth_set_bit_config(struct nfp_nsp *nsp, unsigned int raw_idx,\n  * Return: 0 or -ERRNO.\n  */\n int\n-__nfp_eth_set_aneg(struct nfp_nsp *nsp, enum nfp_eth_aneg mode)\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-\t\t\t\t      NSP_ETH_STATE_ANEG, mode,\n-\t\t\t\t      NSP_ETH_CTRL_SET_ANEG);\n+\t\t\tNSP_ETH_STATE_ANEG, mode, NSP_ETH_CTRL_SET_ANEG);\n }\n \n /*\n@@ -592,11 +602,11 @@ __nfp_eth_set_aneg(struct nfp_nsp *nsp, enum nfp_eth_aneg mode)\n  * Return: 0 or -ERRNO.\n  */\n static int\n-__nfp_eth_set_fec(struct nfp_nsp *nsp, enum nfp_eth_fec mode)\n+__nfp_eth_set_fec(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-\t\t\t\t      NSP_ETH_STATE_FEC, mode,\n-\t\t\t\t      NSP_ETH_CTRL_SET_FEC);\n+\t\t\tNSP_ETH_STATE_FEC, mode, NSP_ETH_CTRL_SET_FEC);\n }\n \n /*\n@@ -611,7 +621,9 @@ __nfp_eth_set_fec(struct nfp_nsp *nsp, enum nfp_eth_fec mode)\n  * -ERRNO - configuration failed.\n  */\n int\n-nfp_eth_set_fec(struct nfp_cpp *cpp, unsigned int idx, enum nfp_eth_fec mode)\n+nfp_eth_set_fec(struct nfp_cpp *cpp,\n+\t\tunsigned int idx,\n+\t\tenum nfp_eth_fec mode)\n {\n \tstruct nfp_nsp *nsp;\n \tint err;\n@@ -642,7 +654,8 @@ nfp_eth_set_fec(struct nfp_cpp *cpp, unsigned int idx, enum nfp_eth_fec mode)\n  * Return: 0 or -ERRNO.\n  */\n int\n-__nfp_eth_set_speed(struct nfp_nsp *nsp, unsigned int speed)\n+__nfp_eth_set_speed(struct nfp_nsp *nsp,\n+\t\tunsigned int speed)\n {\n \tenum nfp_eth_rate rate;\n \n@@ -653,8 +666,7 @@ __nfp_eth_set_speed(struct nfp_nsp *nsp, unsigned int speed)\n \t}\n \n \treturn NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_STATE,\n-\t\t\t\t      NSP_ETH_STATE_RATE, rate,\n-\t\t\t\t      NSP_ETH_CTRL_SET_RATE);\n+\t\t\tNSP_ETH_STATE_RATE, rate, NSP_ETH_CTRL_SET_RATE);\n }\n \n /*\n@@ -668,8 +680,9 @@ __nfp_eth_set_speed(struct nfp_nsp *nsp, unsigned int speed)\n  * Return: 0 or -ERRNO.\n  */\n int\n-__nfp_eth_set_split(struct nfp_nsp *nsp, unsigned int lanes)\n+__nfp_eth_set_split(struct nfp_nsp *nsp,\n+\t\tunsigned int lanes)\n {\n-\treturn NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_PORT, NSP_ETH_PORT_LANES,\n-\t\t\t\t      lanes, NSP_ETH_CTRL_SET_LANES);\n+\treturn NFP_ETH_SET_BIT_CONFIG(nsp, NSP_ETH_RAW_PORT,\n+\t\t\tNSP_ETH_PORT_LANES, lanes, NSP_ETH_CTRL_SET_LANES);\n }\ndiff --git a/drivers/net/nfp/nfpcore/nfp_resource.c b/drivers/net/nfp/nfpcore/nfp_resource.c\nindex 838cd6e0ef..57089c770f 100644\n--- a/drivers/net/nfp/nfpcore/nfp_resource.c\n+++ b/drivers/net/nfp/nfpcore/nfp_resource.c\n@@ -64,7 +64,8 @@ struct nfp_resource {\n };\n \n static int\n-nfp_cpp_resource_find(struct nfp_cpp *cpp, struct nfp_resource *res)\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 \tstruct nfp_resource_entry entry;\n@@ -85,7 +86,7 @@ nfp_cpp_resource_find(struct nfp_cpp *cpp, struct nfp_resource *res)\n \n \tfor (i = 0; i < NFP_RESOURCE_TBL_ENTRIES; i++) {\n \t\tuint64_t addr = NFP_RESOURCE_TBL_BASE +\n-\t\t\tsizeof(struct nfp_resource_entry) * i;\n+\t\t\t\tsizeof(struct nfp_resource_entry) * i;\n \n \t\tret = nfp_cpp_read(cpp, cpp_id, addr, &entry, sizeof(entry));\n \t\tif (ret != sizeof(entry))\n@@ -95,12 +96,11 @@ nfp_cpp_resource_find(struct nfp_cpp *cpp, struct nfp_resource *res)\n \t\t\tcontinue;\n \n \t\t/* Found key! */\n-\t\tres->mutex =\n-\t\t\tnfp_cpp_mutex_alloc(cpp,\n-\t\t\t\t\t    NFP_RESOURCE_TBL_TARGET, addr, key);\n+\t\tres->mutex = nfp_cpp_mutex_alloc(cpp, NFP_RESOURCE_TBL_TARGET,\n+\t\t\t\taddr, key);\n \t\tres->cpp_id = NFP_CPP_ID(entry.region.cpp_target,\n-\t\t\t\t\t entry.region.cpp_action,\n-\t\t\t\t\t entry.region.cpp_token);\n+\t\t\t\tentry.region.cpp_action,\n+\t\t\t\tentry.region.cpp_token);\n \t\tres->addr = ((uint64_t)entry.region.page_offset) << 8;\n \t\tres->size = (uint64_t)entry.region.page_size << 8;\n \t\treturn 0;\n@@ -110,8 +110,9 @@ nfp_cpp_resource_find(struct nfp_cpp *cpp, struct nfp_resource *res)\n }\n \n static int\n-nfp_resource_try_acquire(struct nfp_cpp *cpp, struct nfp_resource *res,\n-\t\t\t struct nfp_cpp_mutex *dev_mutex)\n+nfp_resource_try_acquire(struct nfp_cpp *cpp,\n+\t\tstruct nfp_resource *res,\n+\t\tstruct nfp_cpp_mutex *dev_mutex)\n {\n \tint err;\n \n@@ -148,7 +149,8 @@ nfp_resource_try_acquire(struct nfp_cpp *cpp, struct nfp_resource *res,\n  * Return: NFP Resource handle, or NULL\n  */\n struct nfp_resource *\n-nfp_resource_acquire(struct nfp_cpp *cpp, const char *name)\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@@ -165,8 +167,7 @@ nfp_resource_acquire(struct nfp_cpp *cpp, const char *name)\n \tstrncpy(res->name, name, NFP_RESOURCE_ENTRY_NAME_SZ);\n \n \tdev_mutex = nfp_cpp_mutex_alloc(cpp, NFP_RESOURCE_TBL_TARGET,\n-\t\t\t\t\tNFP_RESOURCE_TBL_BASE,\n-\t\t\t\t\tNFP_RESOURCE_TBL_KEY);\n+\t\t\tNFP_RESOURCE_TBL_BASE, NFP_RESOURCE_TBL_KEY);\n \tif (dev_mutex == NULL) {\n \t\tfree(res);\n \t\treturn NULL;\n@@ -234,8 +235,8 @@ nfp_resource_cpp_id(const struct nfp_resource *res)\n  *\n  * Return: const char pointer to the name of the resource\n  */\n-const char\n-*nfp_resource_name(const struct nfp_resource *res)\n+const char *\n+nfp_resource_name(const struct nfp_resource *res)\n {\n \treturn res->name;\n }\ndiff --git a/drivers/net/nfp/nfpcore/nfp_resource.h b/drivers/net/nfp/nfpcore/nfp_resource.h\nindex 06cc6f74f4..009b7359a4 100644\n--- a/drivers/net/nfp/nfpcore/nfp_resource.h\n+++ b/drivers/net/nfp/nfpcore/nfp_resource.h\n@@ -18,7 +18,7 @@\n struct nfp_resource;\n \n struct nfp_resource *nfp_resource_acquire(struct nfp_cpp *cpp,\n-\t\t\t\t\t  const char *name);\n+\t\tconst char *name);\n \n /**\n  * Release a NFP Resource, and free the handle\ndiff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c\nindex 4c45aec5c1..aa3b7a483e 100644\n--- a/drivers/net/nfp/nfpcore/nfp_rtsym.c\n+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c\n@@ -40,22 +40,25 @@ struct nfp_rtsym_table {\n };\n \n static int\n-nfp_meid(uint8_t island_id, uint8_t menum)\n+nfp_meid(uint8_t island_id,\n+\t\tuint8_t menum)\n {\n \treturn (island_id & 0x3F) == island_id && menum < 12 ?\n \t\t(island_id << 4) | (menum + 4) : -1;\n }\n \n static void\n-nfp_rtsym_sw_entry_init(struct nfp_rtsym_table *cache, uint32_t strtab_size,\n-\t\t\tstruct nfp_rtsym *sw, struct nfp_rtsym_entry *fw)\n+nfp_rtsym_sw_entry_init(struct nfp_rtsym_table *cache,\n+\t\tuint32_t strtab_size,\n+\t\tstruct nfp_rtsym *sw,\n+\t\tstruct nfp_rtsym_entry *fw)\n {\n \tsw->type = fw->type;\n \tsw->name = cache->strtab + rte_le_to_cpu_16(fw->name) % strtab_size;\n \tsw->addr = ((uint64_t)fw->addr_hi << 32) |\n-\t\t   rte_le_to_cpu_32(fw->addr_lo);\n+\t\t\trte_le_to_cpu_32(fw->addr_lo);\n \tsw->size = ((uint64_t)fw->size_hi << 32) |\n-\t\t   rte_le_to_cpu_32(fw->size_lo);\n+\t\t\trte_le_to_cpu_32(fw->size_lo);\n \n \tPMD_INIT_LOG(DEBUG, \"rtsym_entry_init name=%s, addr=%\" PRIx64 \", size=%\" PRIu64 \", target=%d\",\n \t\t     sw->name, sw->addr, sw->size, sw->target);\n@@ -93,7 +96,8 @@ nfp_rtsym_table_read(struct nfp_cpp *cpp)\n }\n \n struct nfp_rtsym_table *\n-__nfp_rtsym_table_read(struct nfp_cpp *cpp, const struct nfp_mip *mip)\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@@ -142,7 +146,7 @@ __nfp_rtsym_table_read(struct nfp_cpp *cpp, const struct nfp_mip *mip)\n \n \tfor (n = 0; n < cache->num; n++)\n \t\tnfp_rtsym_sw_entry_init(cache, strtab_size,\n-\t\t\t\t\t&cache->symtab[n], &rtsymtab[n]);\n+\t\t\t\t&cache->symtab[n], &rtsymtab[n]);\n \n \tfree(rtsymtab);\n \n@@ -178,7 +182,8 @@ nfp_rtsym_count(struct nfp_rtsym_table *rtbl)\n  * Return: const pointer to a struct nfp_rtsym descriptor, or NULL\n  */\n const struct nfp_rtsym *\n-nfp_rtsym_get(struct nfp_rtsym_table *rtbl, int idx)\n+nfp_rtsym_get(struct nfp_rtsym_table *rtbl,\n+\t\tint idx)\n {\n \tif (rtbl == NULL)\n \t\treturn NULL;\n@@ -197,7 +202,8 @@ nfp_rtsym_get(struct nfp_rtsym_table *rtbl, int idx)\n  * Return: const pointer to a struct nfp_rtsym descriptor, or NULL\n  */\n const struct nfp_rtsym *\n-nfp_rtsym_lookup(struct nfp_rtsym_table *rtbl, const char *name)\n+nfp_rtsym_lookup(struct nfp_rtsym_table *rtbl,\n+\t\tconst char *name)\n {\n \tint n;\n \n@@ -331,7 +337,9 @@ nfp_rtsym_readq(struct nfp_cpp *cpp,\n  * Return: value read, on error sets the error and returns ~0ULL.\n  */\n uint64_t\n-nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl, const char *name, int *error)\n+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@@ -354,7 +362,7 @@ nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl, const char *name, int *error)\n \t\tbreak;\n \tdefault:\n \t\tPMD_DRV_LOG(ERR, \"rtsym '%s' unsupported size: %\" PRId64,\n-\t\t\tname, sym->size);\n+\t\t\t\tname, sym->size);\n \t\terr = -EINVAL;\n \t\tbreak;\n \t}\n@@ -372,8 +380,10 @@ nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl, const char *name, int *error)\n }\n \n uint8_t *\n-nfp_rtsym_map(struct nfp_rtsym_table *rtbl, const char *name,\n-\t      unsigned int min_size, struct nfp_cpp_area **area)\n+nfp_rtsym_map(struct nfp_rtsym_table *rtbl,\n+\t\tconst char *name,\n+\t\tunsigned int min_size,\n+\t\tstruct nfp_cpp_area **area)\n {\n \tint ret;\n \tuint8_t *mem;\n@@ -397,7 +407,7 @@ nfp_rtsym_map(struct nfp_rtsym_table *rtbl, const char *name,\n \n \tif (sym->size < min_size) {\n \t\tPMD_DRV_LOG(ERR, \"Symbol %s too small (%\" PRIu64 \" < %u)\", name,\n-\t\t\tsym->size, min_size);\n+\t\t\t\tsym->size, min_size);\n \t\treturn NULL;\n \t}\n \ndiff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.h b/drivers/net/nfp/nfpcore/nfp_rtsym.h\nindex 8b494211bc..30768f1ccf 100644\n--- a/drivers/net/nfp/nfpcore/nfp_rtsym.h\n+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.h\n@@ -43,19 +43,18 @@ struct nfp_rtsym_table;\n \n struct nfp_rtsym_table *nfp_rtsym_table_read(struct nfp_cpp *cpp);\n \n-struct nfp_rtsym_table *\n-__nfp_rtsym_table_read(struct nfp_cpp *cpp, const struct nfp_mip *mip);\n+struct nfp_rtsym_table *__nfp_rtsym_table_read(struct nfp_cpp *cpp,\n+\t\tconst struct nfp_mip *mip);\n \n int nfp_rtsym_count(struct nfp_rtsym_table *rtbl);\n \n const struct nfp_rtsym *nfp_rtsym_get(struct nfp_rtsym_table *rtbl, int idx);\n \n-const struct nfp_rtsym *\n-nfp_rtsym_lookup(struct nfp_rtsym_table *rtbl, const char *name);\n+const struct nfp_rtsym *nfp_rtsym_lookup(struct nfp_rtsym_table *rtbl,\n+\t\tconst char *name);\n \n uint64_t nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl, const char *name,\n-\t\t\t   int *error);\n-uint8_t *\n-nfp_rtsym_map(struct nfp_rtsym_table *rtbl, const char *name,\n-\t      unsigned int min_size, struct nfp_cpp_area **area);\n+\t\tint *error);\n+uint8_t *nfp_rtsym_map(struct nfp_rtsym_table *rtbl, const char *name,\n+\t\tunsigned int min_size, struct nfp_cpp_area **area);\n #endif\n",
    "prefixes": [
        "02/27"
    ]
}