Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935080AbcJQTDa (ORCPT ); Mon, 17 Oct 2016 15:03:30 -0400 Received: from mail-by2nam03on0070.outbound.protection.outlook.com ([104.47.42.70]:51588 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933231AbcJQTDY (ORCPT ); Mon, 17 Oct 2016 15:03:24 -0400 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com;nxp.com; dkim=none (message not signed) header.d=none; From: Stuart Yoder To: CC: , , , , , , Ioana Ciornei , Stuart Yoder Subject: [PATCH 09/14] staging: fsl-mc: misc whitespace cleanup Date: Mon, 17 Oct 2016 13:43:16 -0500 Message-ID: <1476729796-10141-1-git-send-email-stuart.yoder@nxp.com> X-Mailer: git-send-email 1.9.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131212037453990867;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.158.2;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(189998001)(50466002)(5003940100001)(104016004)(110136003)(69596002)(2351001)(85426001)(50226002)(87936001)(5660300001)(8676002)(47776003)(33646002)(36756003)(11100500001)(48376002)(106466001)(229853001)(86362001)(305945005)(7846002)(77096005)(97736004)(586003)(8666005)(105606002)(92566002)(626004)(6916009)(50986999)(8936002)(6666003)(19580395003)(2906002)(68736007)(356003)(19580405001)(81156014)(81166006)(4326007)(7059030)(2004002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN3PR03MB1413;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11OLC014;1:yy8gXzWCIImTH5KnMYHt3RyCRvsOwTwIgcsblNi1hfgqutFz9TAS3Dftm3RQB2qZTYt9pWJrL00b8vVkWtrKengwYsJRYMgOJZvmhytrbhuTW/CbCmCxO0AilidP3eWeS+z8Vmr473X71QlIjtV1C2gkJuqD7WN95sYoSPAaV7KtgZ8x3Ml9fPz9mMG8MtnuIItS9QyxiDIP5Sxpp7S030p8V4kh2XyiGz/BNt4sr+NEOpr9ngFG3BB6XqqlR+Ecwnj8MD+cqpyxK7a6wwATA2DIV9RWrLK6NDPQ73cA97MDJIoNKDv9WasSjxO6WauBeFbPt862xgZ/7p62Eem3I66m1KuZbAynUj49UIS/x8Gh5cFsEou4AU/q2Qu+enzCBgovHMxyWCo8XySrDzpgkBxwAnTYxwFH83XsG6Jigjyi58RSyiM0Vd2Y2fdMdbFPMjwhsBkxjH6iLPj0BHhKYw+TidN95fwbS7PKyxr+RIObJeymHBEAYU0da4444LfS2k8LSKjpZqecmfjWgPGCrgUSZmx5ousqGWbSqjt4L4x2H/RARqvvw8J1v+IVGCrM1PpQUSdadb/02Zp+7E30juiWh5sFiQ/xPlg3V8ET2r9N3/g3V95PVtpeb9MN0kpBGnLkGPTPge2BgXnyOZq3nussWvRnc+kI4awsiUd1oRpE2THxBJJCTIxHMIcNCocoBgw6hfkqYvt1Tajx9rdJYRkuKziwZreSkQhgKClsZko= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 2316f308-ec9a-42c2-ea76-08d3f6be4527 X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB1413;2:TqmNreWT1NqTzduE6/4kGjMZSmBAQixE2UZF0y8H3j4vMZJ7kxOvG4niwScLA/H/PYWILiVVGyucGNpXD4mpp67qw7nOqvjGZjiYoyTLK6gOi757DTecsoAAr/cuQ5BhIlEHv3aEwx6QMuLm02dnJgOodCMj9xHBeRyRr/M7RzI3QVOGp/ajIN08ISDFz5QvlmcTGOaU7rzhecx8HlfFwg==;3:rw9tMGKiS9+TrSN5JM2FCOk12iWAL1D3erEzvWZcIl+hyC95V/rLODukgwnO8JLsHbGjHGyz/8VQ9HaK3z4Z1GcUGRD4wCA2b6/1p8mJe1m2ia4UEOkXdZXSqDoSdyhbE9Wqie1eKZFrECZnuhl0RbsoWryatCyQRSZB1ZOW86kj3/k/q0DqNezw11zHULyUexECkV1ffBHhI5PfSMzAXE5+Ah8PWzMEKIGJENi/6k1QyxYVikVNCU1qXXb18Sao;25:5STpvmqU4hBTaYPVbKjzWSXjog0a+uqng8rq+jN9S4CSErxZDLCqPKq3KfGHUwKO555WcZ+WFKomJOzbtADuHPKTDxJ9s/oYHeU3jWA6/zpRLyqD1DsAGV8ksgzEEa9LKnudF0qRXD3CKm3Zb1NfUGQpwsJDXhglOA38cwzFH8UnTJNoTdKmjAHsRcGI2gbEben3jqRjhgvJVlS66ZCNJSwBCxtzSzV+8M/uYDsB7d9BqjighdpDRqAu4Q/WsfGiKjhADgoHx8rga4FmF3ay1AKfo+MlFUyVGLI3XX/CdCac2DztdbRmZrgZifA8PUfxItwWDuf4TBby8Ua7YesWNimXVXsUXsDkPcxxDw5TBAy7LjFcq57lnFQ5wHwEPHqdMlkeGK2y+sNCl4gSkSxeT8g2T4KaEoLxZZ2RKLAkfYoEdppRN4dEORkAkApoSwu4G7kWtrq7FslzV1N/kju/lQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1413; X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB1413;31:vHvbT5+MEJf/KP20yoZ3TxsX1oE97Y39qgF5wvTeeRISyMw2mIJ3bJeESi2S9oi4bNfs0/voz3Xfns6f+P8d7J3wnRjCvSyEdjfjihEnsINP9UkoxitXEDD6u0XnbQlbPyWwZaZNC4/8KQf/J0UyhKmYc8KbdBnkFsPHg2iX1+7pWklsYaFn/tLd73Z+fFo7g6tqGZn06HrIc8wIOKPdwmt3x9yL6WV3fOfr5iIxVrGlkAZnPImdrKIkEEZDsaZh+1WOns6heMJPhqecqNEeIKei7m3fualWPUQn0tc4YpY=;4:px78fMOZDTI2YM+U4hBoMLOIu7V63QuzvegeWwP4yCoOMv/ylrj8vaqPUT/I0MFH5MxNuKwbmbP8UWvliK8v1jvsH+l5n91l0XyLeQlaDljqmQiqGNlwVdlXXHu05Gs2da/j1G0v4ANNOK8E6+K328l2zqXI/SiqgCmmj0+2C0+VKEQlusEvMfM7/oizeZnB09kkvyfmoaFxpPGqr3gaIOUaC7IMZm9sY4x6cfvyD1sGCpCR+zh5kFa8qOCHOOplbxIYJaStRnvO8Ow/2EheTTVmu2/frg7ugj0kpBwZqwl7L47K+ooT636TkZEmRAxl6n/zLoD6APm2zr4uPxseAmrpTi+FDWGkIh+efIROZP3AkTL0Olaoe7JV62G24JSldoVCONqtlbyJ+5Cd0OXkt7UBTYhCOCVW7xnkwOchrJIWc8r7SbphBI/E0uzI7im+3TgHvRM2g7lGtzA0Y2HOz1YNc9XEMU6DXzoZPHMjk80GgVHnqulSAMZVIWvPFV/ng5NCq9dGsJ7pPoXmhtE/pjkcelaq8Q1d93fNqOqrkpzucZKW71tvoL1J/u1rp5WVHo3owM5nX/z8LFajE3NqWE6WaXPvdGNcTqm35NyD+wIfj/f1uiBjk+eACgrq9+ls X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684)(21532816269658); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(13023025)(13015025)(13017025)(13018025)(13024025)(8121501046)(5005006)(3002001)(10201501046)(6055026);SRVR:BN3PR03MB1413;BCL:0;PCL:0;RULEID:(400006);SRVR:BN3PR03MB1413; X-Forefront-PRVS: 0098BA6C6C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN3PR03MB1413;23:jWHDiWL8L7xZAlkT+v7SF0xRMDsv1vi6mkmDZdNUo?= =?us-ascii?Q?m3KsIa4+Dj3giWVb0CVM5Xwxev9nsskRc50XSxSzUrBxVrjuTPCLinE2JFeG?= =?us-ascii?Q?u8rQvbmIBJjb4+ZMFt+g96fe1Py7h+rwtrniPzoNVwQM3dzg4nobemjih9Zm?= =?us-ascii?Q?SCYMzohcPD5lmiVCDzyrdj+1kje4zxjrOzmA/NcKkWaa4tkwEZ61oyMeALZa?= =?us-ascii?Q?jHm7ZSO1Sg3y4TVH/vmwIzXnG/0pWM0P6GLTYh0nFfzXubIAbVOyOc0EKaH+?= =?us-ascii?Q?u8UcDJr8Y0Nq2Tn98amMtVc3DN/DzfPkPlKCepJluiXWef9/F1HBZPqYa3nI?= =?us-ascii?Q?V+LS3PtBm7ViLSTxUi6lxwQysCYimWW4jp5F7SYBSPMnnE7iq7F79UT3t1h5?= =?us-ascii?Q?2XjHECbppOPVoNlY61dZq2NtstUvu/Zfd0yLDaPtw+WBdb4zc57O3e9YWYq3?= =?us-ascii?Q?PhHInb8427p+kQJxqt2HBcxm9RPWpal7oKP4HTypkpuVNLlNMZ18QaQTEcnp?= =?us-ascii?Q?7sLtlrxWQMuNwlk3qijzvwEh/I6oQDPJypRJkT29W0wdQ8pbGN159wZvFD+z?= =?us-ascii?Q?eVMUUG7+dkwwUUupsp8BO+Iz2zNCWoXdI67rqE14aeAftL9ICUUyZZKPZbqI?= =?us-ascii?Q?0wvLYGp+H4bq4ncm1/JpwGYyQC8EdgV9MZa2WxXwi1tc8lV1dCBjAKOoCwsU?= =?us-ascii?Q?mSy0hJDtgI+ze/bVaYU73i0eHtu+91Chx/zagIswJx4BAvD54aJ+TjMBFaIG?= =?us-ascii?Q?XIr4AdXLkwUP9uY8QsFSRT9M/2Aj3ZwUY5pPmEQV8mdhdBSzQg2ORqSu+RVw?= =?us-ascii?Q?Xkf5f3OnNJIGqHhwvFxI1VNgIP6SKpmkxoYrFWufqXVOUOIKVsYQ1R++PPeJ?= =?us-ascii?Q?3ddP3HiI9Zldszl7taNTfhAWpsNX3JKf/kCYySuHLdNFl5j6Xw5wZmq6Xc/a?= =?us-ascii?Q?H74XghNmFu/k+o7WyohUWf8qLr16K0kJIMpOdo7bLYavkB3smuC91tg4pszu?= =?us-ascii?Q?NytY4dVtTaMwcvx/YztKvnziQGfo2Lq/y+uJw/5l67sLFLvtNUEdBYE9aHs6?= =?us-ascii?Q?KISDtwHd4TA1N6LuaQQ8A8KFHTiUqM5UETFHh51hMXXW/HhYN2NPjUn58XZg?= =?us-ascii?Q?A92eRuuSU2+zax0mzB5gmQoSuDmBDRRfXGtBf7WCRDUIoDNugt1ApOogejHy?= =?us-ascii?Q?uGHDash/Tv3qykRKAp+vbgZM4WY3d3YgajE?= X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB1413;6:4cXDjnmSAkWoUUDTSy9RwyaNZGaroDMq79c8aNF5fKIi6ufzZ+m+TaY92upEbh1ndQMDRu1oEMPx642Rl6TNJX7qdO/qyJel56Nw1QGr6oBjak09XgHEh82LjknPYOmPV8DC4ajSii0DBUaHPJSoYBBsm+ezCaQcdS5LnRh/Zm2jHJ3+ZEgsmI/tUEhMX3yRbzPP/Td6IioE4lgC9OV2rx0vCbsGQORWsmrSJoW03zwXCGpSXWgjm7WERuEGIdslX4yMR0mhojRmgoc6VoBf28YRKah5oKegTMXZuegiWnfRFloGjWeRTDugdFLgnHmy;5:E05uyUTvwia9J5lCiQ30Q6OM6X8YFrvbrXpZGb0by+2Sn4eGn5Vi+zp9xTrdI5HgL9oaaCl0PxMr7sAOgHY4Wm69eDbkEIxremg0DQ4N28ntH4ew49W4oqlEnimbyh2Kno1/3gcS2FP51YZ5u8htwyil8CNfOReuUGjT59iA5WNzF8P9Qlacmaxxqr9JnSmJ;24:0V7/lD2ltAoJqdGBYBA6hGB5ISuvW7F+gxb6DSNV6gLapO+tudlFmsNzAsBeMUoPbMqBXD3O2+IbhVTGDUp52d/n/jMvh3zbskQIQvmm2Ng= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN3PR03MB1413;7:dg8V1l0NsKnjDbePJ+O9GUf04zOHLybBPACRMf5tGODA3Hutl8zmaO4p90lo7f6kjSKq5uatdVNQVRzyr+o7KZamqirVChinexGGE8NA45ozc405H35PabAbLmiGhuyqhk4fLdROtsF6SLLHQ+MGjFYe/uBH5H4iwRPm3RL3lwU0iHzOAoVqwNcKFLqr9mYPJTHk/N4TUwSr8TA+oGerzL1MRk0V+z+K8P7uxEpKSCDwekUnO8zN4+Zv9FP3qH/nVwh4tncZJ+l6DPRqJdIK1G4y/01GRHY9rDoGSCjOF996K1k8Lzgls+tH6mADv5ny8C11Av1xrAIeJKnPgTdM329sND7mPlrpbGRS5sX+qmI= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2016 18:49:04.9466 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.158.2];Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB1413 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 28886 Lines: 981 From: Ioana Ciornei Make whitespace consistent with other fsl-mc source files. -delete extraneous tabs -align start of function arguments properly -for structs and function definitions, separate type and variable name by a single space -remove multiple blank lines in comments Signed-off-by: Ioana Ciornei Signed-off-by: Stuart Yoder --- drivers/staging/fsl-mc/bus/dpbp-cmd.h | 1 - drivers/staging/fsl-mc/bus/dpbp.c | 1 - drivers/staging/fsl-mc/bus/dpcon-cmd.h | 1 - drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 1 - drivers/staging/fsl-mc/bus/dpmcp.c | 1 - drivers/staging/fsl-mc/bus/dpmcp.h | 107 +++++------ drivers/staging/fsl-mc/bus/dpmng-cmd.h | 1 - drivers/staging/fsl-mc/bus/dpmng.c | 1 - drivers/staging/fsl-mc/bus/dprc-cmd.h | 1 - drivers/staging/fsl-mc/bus/dprc.c | 1 - drivers/staging/fsl-mc/bus/mc-io.c | 1 - drivers/staging/fsl-mc/bus/mc-sys.c | 1 - drivers/staging/fsl-mc/include/dpbp.h | 148 +++++++------- drivers/staging/fsl-mc/include/dpmng.h | 16 +- drivers/staging/fsl-mc/include/dprc.h | 342 ++++++++++++++++----------------- 15 files changed, 306 insertions(+), 318 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/dpbp-cmd.h b/drivers/staging/fsl-mc/bus/dpbp-cmd.h index 2860411..489c27f 100644 --- a/drivers/staging/fsl-mc/bus/dpbp-cmd.h +++ b/drivers/staging/fsl-mc/bus/dpbp-cmd.h @@ -11,7 +11,6 @@ * names of any contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * * ALTERNATIVELY, this software may be distributed under the terms of the * GNU General Public License ("GPL") as published by the Free Software * Foundation, either version 2 of that License or (at your option) any diff --git a/drivers/staging/fsl-mc/bus/dpbp.c b/drivers/staging/fsl-mc/bus/dpbp.c index b392745..0b2064e 100644 --- a/drivers/staging/fsl-mc/bus/dpbp.c +++ b/drivers/staging/fsl-mc/bus/dpbp.c @@ -11,7 +11,6 @@ * names of any contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * * ALTERNATIVELY, this software may be distributed under the terms of the * GNU General Public License ("GPL") as published by the Free Software * Foundation, either version 2 of that License or (at your option) any diff --git a/drivers/staging/fsl-mc/bus/dpcon-cmd.h b/drivers/staging/fsl-mc/bus/dpcon-cmd.h index 536b2ef..c89b305 100644 --- a/drivers/staging/fsl-mc/bus/dpcon-cmd.h +++ b/drivers/staging/fsl-mc/bus/dpcon-cmd.h @@ -11,7 +11,6 @@ * names of any contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * * ALTERNATIVELY, this software may be distributed under the terms of the * GNU General Public License ("GPL") as published by the Free Software * Foundation, either version 2 of that License or (at your option) any diff --git a/drivers/staging/fsl-mc/bus/dpmcp-cmd.h b/drivers/staging/fsl-mc/bus/dpmcp-cmd.h index d098a6d..b77c902 100644 --- a/drivers/staging/fsl-mc/bus/dpmcp-cmd.h +++ b/drivers/staging/fsl-mc/bus/dpmcp-cmd.h @@ -11,7 +11,6 @@ * names of any contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * * ALTERNATIVELY, this software may be distributed under the terms of the * GNU General Public License ("GPL") as published by the Free Software * Foundation, either version 2 of that License or (at your option) any diff --git a/drivers/staging/fsl-mc/bus/dpmcp.c b/drivers/staging/fsl-mc/bus/dpmcp.c index 55766f7..865572d4 100644 --- a/drivers/staging/fsl-mc/bus/dpmcp.c +++ b/drivers/staging/fsl-mc/bus/dpmcp.c @@ -11,7 +11,6 @@ * names of any contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * * ALTERNATIVELY, this software may be distributed under the terms of the * GNU General Public License ("GPL") as published by the Free Software * Foundation, either version 2 of that License or (at your option) any diff --git a/drivers/staging/fsl-mc/bus/dpmcp.h b/drivers/staging/fsl-mc/bus/dpmcp.h index 5434e09..3911f92 100644 --- a/drivers/staging/fsl-mc/bus/dpmcp.h +++ b/drivers/staging/fsl-mc/bus/dpmcp.h @@ -11,7 +11,6 @@ * names of any contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * * ALTERNATIVELY, this software may be distributed under the terms of the * GNU General Public License ("GPL") as published by the Free Software * Foundation, either version 2 of that License or (at your option) any @@ -59,10 +58,10 @@ struct dpmcp_cfg { int portal_id; }; -int dpmcp_create(struct fsl_mc_io *mc_io, - u32 cmd_flags, - const struct dpmcp_cfg *cfg, - u16 *token); +int dpmcp_create(struct fsl_mc_io *mc_io, + u32 cmd_flags, + const struct dpmcp_cfg *cfg, + u16 *token); int dpmcp_destroy(struct fsl_mc_io *mc_io, u32 cmd_flags, @@ -85,53 +84,53 @@ int dpmcp_reset(struct fsl_mc_io *mc_io, * @irq_num: A user defined number associated with this IRQ */ struct dpmcp_irq_cfg { - u64 paddr; - u32 val; - int irq_num; + u64 paddr; + u32 val; + int irq_num; }; -int dpmcp_set_irq(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - struct dpmcp_irq_cfg *irq_cfg); - -int dpmcp_get_irq(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - int *type, - struct dpmcp_irq_cfg *irq_cfg); - -int dpmcp_set_irq_enable(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u8 en); - -int dpmcp_get_irq_enable(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u8 *en); - -int dpmcp_set_irq_mask(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u32 mask); - -int dpmcp_get_irq_mask(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u32 *mask); - -int dpmcp_get_irq_status(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u32 *status); +int dpmcp_set_irq(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + struct dpmcp_irq_cfg *irq_cfg); + +int dpmcp_get_irq(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + int *type, + struct dpmcp_irq_cfg *irq_cfg); + +int dpmcp_set_irq_enable(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u8 en); + +int dpmcp_get_irq_enable(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u8 *en); + +int dpmcp_set_irq_mask(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u32 mask); + +int dpmcp_get_irq_mask(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u32 *mask); + +int dpmcp_get_irq_status(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u32 *status); /** * struct dpmcp_attr - Structure representing DPMCP attributes @@ -151,9 +150,9 @@ struct dpmcp_attr { } version; }; -int dpmcp_get_attributes(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - struct dpmcp_attr *attr); +int dpmcp_get_attributes(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + struct dpmcp_attr *attr); #endif /* __FSL_DPMCP_H */ diff --git a/drivers/staging/fsl-mc/bus/dpmng-cmd.h b/drivers/staging/fsl-mc/bus/dpmng-cmd.h index a7b77d5..d42d977 100644 --- a/drivers/staging/fsl-mc/bus/dpmng-cmd.h +++ b/drivers/staging/fsl-mc/bus/dpmng-cmd.h @@ -12,7 +12,6 @@ * names of any contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * * ALTERNATIVELY, this software may be distributed under the terms of the * GNU General Public License ("GPL") as published by the Free Software * Foundation, either version 2 of that License or (at your option) any diff --git a/drivers/staging/fsl-mc/bus/dpmng.c b/drivers/staging/fsl-mc/bus/dpmng.c index 96b1d67..13bec9e 100644 --- a/drivers/staging/fsl-mc/bus/dpmng.c +++ b/drivers/staging/fsl-mc/bus/dpmng.c @@ -11,7 +11,6 @@ * names of any contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * * ALTERNATIVELY, this software may be distributed under the terms of the * GNU General Public License ("GPL") as published by the Free Software * Foundation, either version 2 of that License or (at your option) any diff --git a/drivers/staging/fsl-mc/bus/dprc-cmd.h b/drivers/staging/fsl-mc/bus/dprc-cmd.h index 009d656..154ce2f 100644 --- a/drivers/staging/fsl-mc/bus/dprc-cmd.h +++ b/drivers/staging/fsl-mc/bus/dprc-cmd.h @@ -12,7 +12,6 @@ * names of any contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * * ALTERNATIVELY, this software may be distributed under the terms of the * GNU General Public License ("GPL") as published by the Free Software * Foundation, either version 2 of that License or (at your option) any diff --git a/drivers/staging/fsl-mc/bus/dprc.c b/drivers/staging/fsl-mc/bus/dprc.c index 9fea3de..24c8dfb 100644 --- a/drivers/staging/fsl-mc/bus/dprc.c +++ b/drivers/staging/fsl-mc/bus/dprc.c @@ -11,7 +11,6 @@ * names of any contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * * ALTERNATIVELY, this software may be distributed under the terms of the * GNU General Public License ("GPL") as published by the Free Software * Foundation, either version 2 of that License or (at your option) any diff --git a/drivers/staging/fsl-mc/bus/mc-io.c b/drivers/staging/fsl-mc/bus/mc-io.c index 798c965..fbfda4c 100644 --- a/drivers/staging/fsl-mc/bus/mc-io.c +++ b/drivers/staging/fsl-mc/bus/mc-io.c @@ -11,7 +11,6 @@ * names of any contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * * ALTERNATIVELY, this software may be distributed under the terms of the * GNU General Public License ("GPL") as published by the Free Software * Foundation, either version 2 of that License or (at your option) any diff --git a/drivers/staging/fsl-mc/bus/mc-sys.c b/drivers/staging/fsl-mc/bus/mc-sys.c index 285917c..b55a53e 100644 --- a/drivers/staging/fsl-mc/bus/mc-sys.c +++ b/drivers/staging/fsl-mc/bus/mc-sys.c @@ -13,7 +13,6 @@ * names of any contributors may be used to endorse or promote products * derived from this software without specific prior written permission. * - * * ALTERNATIVELY, this software may be distributed under the terms of the * GNU General Public License ("GPL") as published by the Free Software * Foundation, either version 2 of that License or (at your option) any diff --git a/drivers/staging/fsl-mc/include/dpbp.h b/drivers/staging/fsl-mc/include/dpbp.h index e14e85a..32f2788 100644 --- a/drivers/staging/fsl-mc/include/dpbp.h +++ b/drivers/staging/fsl-mc/include/dpbp.h @@ -44,8 +44,8 @@ int dpbp_open(struct fsl_mc_io *mc_io, u16 *token); int dpbp_close(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token); + u32 cmd_flags, + u16 token); /** * struct dpbp_cfg - Structure representing DPBP configuration @@ -55,10 +55,10 @@ struct dpbp_cfg { u32 options; }; -int dpbp_create(struct fsl_mc_io *mc_io, - u32 cmd_flags, - const struct dpbp_cfg *cfg, - u16 *token); +int dpbp_create(struct fsl_mc_io *mc_io, + u32 cmd_flags, + const struct dpbp_cfg *cfg, + u16 *token); int dpbp_destroy(struct fsl_mc_io *mc_io, u32 cmd_flags, @@ -88,59 +88,59 @@ int dpbp_reset(struct fsl_mc_io *mc_io, * @irq_num: A user defined number associated with this IRQ */ struct dpbp_irq_cfg { - u64 addr; - u32 val; - int irq_num; + u64 addr; + u32 val; + int irq_num; }; -int dpbp_set_irq(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - struct dpbp_irq_cfg *irq_cfg); - -int dpbp_get_irq(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - int *type, - struct dpbp_irq_cfg *irq_cfg); - -int dpbp_set_irq_enable(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u8 en); - -int dpbp_get_irq_enable(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u8 *en); - -int dpbp_set_irq_mask(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u32 mask); +int dpbp_set_irq(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + struct dpbp_irq_cfg *irq_cfg); + +int dpbp_get_irq(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + int *type, + struct dpbp_irq_cfg *irq_cfg); + +int dpbp_set_irq_enable(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u8 en); + +int dpbp_get_irq_enable(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u8 *en); + +int dpbp_set_irq_mask(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u32 mask); int dpbp_get_irq_mask(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u32 *mask); - -int dpbp_get_irq_status(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u32 *status); - -int dpbp_clear_irq_status(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u32 status); + u32 cmd_flags, + u16 token, + u8 irq_index, + u32 *mask); + +int dpbp_get_irq_status(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u32 *status); + +int dpbp_clear_irq_status(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u32 status); /** * struct dpbp_attr - Structure representing DPBP attributes @@ -163,10 +163,10 @@ struct dpbp_attr { u16 bpid; }; -int dpbp_get_attributes(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - struct dpbp_attr *attr); +int dpbp_get_attributes(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + struct dpbp_attr *attr); /** * DPBP notifications options @@ -196,24 +196,24 @@ int dpbp_get_attributes(struct fsl_mc_io *mc_io, * @options: Mask of available options; use 'DPBP_NOTIF_OPT_' values */ struct dpbp_notification_cfg { - u32 depletion_entry; - u32 depletion_exit; - u32 surplus_entry; - u32 surplus_exit; - u64 message_iova; - u64 message_ctx; - u16 options; + u32 depletion_entry; + u32 depletion_exit; + u32 surplus_entry; + u32 surplus_exit; + u64 message_iova; + u64 message_ctx; + u16 options; }; -int dpbp_set_notifications(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - struct dpbp_notification_cfg *cfg); +int dpbp_set_notifications(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + struct dpbp_notification_cfg *cfg); -int dpbp_get_notifications(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - struct dpbp_notification_cfg *cfg); +int dpbp_get_notifications(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + struct dpbp_notification_cfg *cfg); /** @} */ diff --git a/drivers/staging/fsl-mc/include/dpmng.h b/drivers/staging/fsl-mc/include/dpmng.h index e5cfd01..de34724 100644 --- a/drivers/staging/fsl-mc/include/dpmng.h +++ b/drivers/staging/fsl-mc/include/dpmng.h @@ -48,9 +48,9 @@ * struct mc_version * @major: Major version number: incremented on API compatibility changes * @minor: Minor version number: incremented on API additions (that are - * backward compatible); reset when major version is incremented + * backward compatible); reset when major version is incremented * @revision: Internal revision number: incremented on implementation changes - * and/or bug fixes that have no impact on API + * and/or bug fixes that have no impact on API */ struct mc_version { u32 major; @@ -58,12 +58,12 @@ struct mc_version { u32 revision; }; -int mc_get_version(struct fsl_mc_io *mc_io, - u32 cmd_flags, - struct mc_version *mc_ver_info); +int mc_get_version(struct fsl_mc_io *mc_io, + u32 cmd_flags, + struct mc_version *mc_ver_info); -int dpmng_get_container_id(struct fsl_mc_io *mc_io, - u32 cmd_flags, - int *container_id); +int dpmng_get_container_id(struct fsl_mc_io *mc_io, + u32 cmd_flags, + int *container_id); #endif /* __FSL_DPMNG_H */ diff --git a/drivers/staging/fsl-mc/include/dprc.h b/drivers/staging/fsl-mc/include/dprc.h index 593b2bb..214d514 100644 --- a/drivers/staging/fsl-mc/include/dprc.h +++ b/drivers/staging/fsl-mc/include/dprc.h @@ -116,17 +116,17 @@ struct dprc_cfg { char label[16]; }; -int dprc_create_container(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - struct dprc_cfg *cfg, - int *child_container_id, - u64 *child_portal_offset); - -int dprc_destroy_container(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - int child_container_id); +int dprc_create_container(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + struct dprc_cfg *cfg, + int *child_container_id, + u64 *child_portal_offset); + +int dprc_destroy_container(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + int child_container_id); int dprc_reset_container(struct fsl_mc_io *mc_io, u32 cmd_flags, @@ -139,7 +139,7 @@ int dprc_reset_container(struct fsl_mc_io *mc_io, #define DPRC_IRQ_INDEX 0 /* Number of dprc's IRQs */ -#define DPRC_NUM_OF_IRQS 1 +#define DPRC_NUM_OF_IRQS 1 /* DPRC IRQ events */ @@ -171,59 +171,59 @@ int dprc_reset_container(struct fsl_mc_io *mc_io, * @irq_num: A user defined number associated with this IRQ */ struct dprc_irq_cfg { - phys_addr_t paddr; - u32 val; - int irq_num; + phys_addr_t paddr; + u32 val; + int irq_num; }; -int dprc_set_irq(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - struct dprc_irq_cfg *irq_cfg); - -int dprc_get_irq(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - int *type, - struct dprc_irq_cfg *irq_cfg); - -int dprc_set_irq_enable(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u8 en); - -int dprc_get_irq_enable(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u8 *en); - -int dprc_set_irq_mask(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u32 mask); - -int dprc_get_irq_mask(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u32 *mask); - -int dprc_get_irq_status(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u32 *status); - -int dprc_clear_irq_status(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - u8 irq_index, - u32 status); +int dprc_set_irq(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + struct dprc_irq_cfg *irq_cfg); + +int dprc_get_irq(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + int *type, + struct dprc_irq_cfg *irq_cfg); + +int dprc_set_irq_enable(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u8 en); + +int dprc_get_irq_enable(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u8 *en); + +int dprc_set_irq_mask(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u32 mask); + +int dprc_get_irq_mask(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u32 *mask); + +int dprc_get_irq_status(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u32 *status); + +int dprc_clear_irq_status(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + u8 irq_index, + u32 status); /** * struct dprc_attributes - Container attributes @@ -249,24 +249,24 @@ struct dprc_attributes { } version; }; -int dprc_get_attributes(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, +int dprc_get_attributes(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, struct dprc_attributes *attributes); int dprc_set_res_quota(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - int child_container_id, - char *type, - u16 quota); + u32 cmd_flags, + u16 token, + int child_container_id, + char *type, + u16 quota); int dprc_get_res_quota(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - int child_container_id, - char *type, - u16 *quota); + u32 cmd_flags, + u16 token, + int child_container_id, + char *type, + u16 *quota); /* Resource request options */ @@ -274,20 +274,20 @@ int dprc_get_res_quota(struct fsl_mc_io *mc_io, * are explicit and sequential (in case of resources). * The base ID is given at res_req at base_align field */ -#define DPRC_RES_REQ_OPT_EXPLICIT 0x00000001 +#define DPRC_RES_REQ_OPT_EXPLICIT 0x00000001 /* Aligned resources request - Relevant only for resources * request (and not objects). Indicates that resources base ID should be * sequential and aligned to the value given at dprc_res_req base_align field */ -#define DPRC_RES_REQ_OPT_ALIGNED 0x00000002 +#define DPRC_RES_REQ_OPT_ALIGNED 0x00000002 /* Plugged Flag - Relevant only for object assignment request. * Indicates that after all objects assigned. An interrupt will be invoked at * the relevant GPP. The assigned object will be marked as plugged. * plugged objects can't be assigned from their container */ -#define DPRC_RES_REQ_OPT_PLUGGED 0x00000004 +#define DPRC_RES_REQ_OPT_PLUGGED 0x00000004 /** * struct dprc_res_req - Resource request descriptor, to be used in assignment @@ -312,33 +312,33 @@ struct dprc_res_req { int id_base_align; }; -int dprc_assign(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - int container_id, - struct dprc_res_req *res_req); - -int dprc_unassign(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - int child_container_id, - struct dprc_res_req *res_req); - -int dprc_get_pool_count(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - int *pool_count); - -int dprc_get_pool(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - int pool_index, - char *type); +int dprc_assign(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + int container_id, + struct dprc_res_req *res_req); + +int dprc_unassign(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + int child_container_id, + struct dprc_res_req *res_req); + +int dprc_get_pool_count(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + int *pool_count); + +int dprc_get_pool(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + int pool_index, + char *type); int dprc_get_obj_count(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - int *obj_count); + u32 cmd_flags, + u16 token, + int *obj_count); /* Objects Attributes Flags */ @@ -353,7 +353,7 @@ int dprc_get_obj_count(struct fsl_mc_io *mc_io, * masters; * user is responsible for proper memory handling through IOMMU configuration. */ -#define DPRC_OBJ_FLAG_NO_MEM_SHAREABILITY 0x0001 +#define DPRC_OBJ_FLAG_NO_MEM_SHAREABILITY 0x0001 /** * struct dprc_obj_desc - Object descriptor, returned from dprc_get_obj() @@ -381,41 +381,41 @@ struct dprc_obj_desc { u16 flags; }; -int dprc_get_obj(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - int obj_index, - struct dprc_obj_desc *obj_desc); - -int dprc_get_obj_desc(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - char *obj_type, - int obj_id, - struct dprc_obj_desc *obj_desc); - -int dprc_set_obj_irq(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - char *obj_type, - int obj_id, - u8 irq_index, - struct dprc_irq_cfg *irq_cfg); - -int dprc_get_obj_irq(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - char *obj_type, - int obj_id, - u8 irq_index, - int *type, - struct dprc_irq_cfg *irq_cfg); +int dprc_get_obj(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + int obj_index, + struct dprc_obj_desc *obj_desc); + +int dprc_get_obj_desc(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + char *obj_type, + int obj_id, + struct dprc_obj_desc *obj_desc); + +int dprc_set_obj_irq(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + char *obj_type, + int obj_id, + u8 irq_index, + struct dprc_irq_cfg *irq_cfg); + +int dprc_get_obj_irq(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + char *obj_type, + int obj_id, + u8 irq_index, + int *type, + struct dprc_irq_cfg *irq_cfg); int dprc_get_res_count(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - char *type, - int *res_count); + u32 cmd_flags, + u16 token, + char *type, + int *res_count); /** * enum dprc_iter_status - Iteration status @@ -444,11 +444,11 @@ struct dprc_res_ids_range_desc { enum dprc_iter_status iter_status; }; -int dprc_get_res_ids(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - char *type, - struct dprc_res_ids_range_desc *range_desc); +int dprc_get_res_ids(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + char *type, + struct dprc_res_ids_range_desc *range_desc); /* Region flags */ /* Cacheable - Indicates that region should be mapped as cacheable */ @@ -481,20 +481,20 @@ struct dprc_region_desc { enum dprc_region_type type; }; -int dprc_get_obj_region(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - char *obj_type, - int obj_id, - u8 region_index, - struct dprc_region_desc *region_desc); +int dprc_get_obj_region(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + char *obj_type, + int obj_id, + u8 region_index, + struct dprc_region_desc *region_desc); int dprc_set_obj_label(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - char *obj_type, - int obj_id, - char *label); + u32 cmd_flags, + u16 token, + char *obj_type, + int obj_id, + char *label); /** * struct dprc_endpoint - Endpoint description for link connect/disconnect @@ -521,24 +521,24 @@ struct dprc_connection_cfg { u32 max_rate; }; -int dprc_connect(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - const struct dprc_endpoint *endpoint1, - const struct dprc_endpoint *endpoint2, +int dprc_connect(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + const struct dprc_endpoint *endpoint1, + const struct dprc_endpoint *endpoint2, const struct dprc_connection_cfg *cfg); -int dprc_disconnect(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - const struct dprc_endpoint *endpoint); - -int dprc_get_connection(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - const struct dprc_endpoint *endpoint1, - struct dprc_endpoint *endpoint2, - int *state); +int dprc_disconnect(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + const struct dprc_endpoint *endpoint); + +int dprc_get_connection(struct fsl_mc_io *mc_io, + u32 cmd_flags, + u16 token, + const struct dprc_endpoint *endpoint1, + struct dprc_endpoint *endpoint2, + int *state); #endif /* _FSL_DPRC_H */ -- 1.9.0