From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755529AbcJZQ2p (ORCPT ); Wed, 26 Oct 2016 12:28:45 -0400 Received: from mail-co1nam03on0046.outbound.protection.outlook.com ([104.47.40.46]:23648 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933361AbcJZQ0y (ORCPT ); Wed, 26 Oct 2016 12:26:54 -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: , , , , , , , , Stuart Yoder Subject: [PATCH v2 05/12] staging: fsl-mc: whitespace cleanup: improve alignment in prototypes Date: Wed, 26 Oct 2016 11:20:27 -0500 Message-ID: <1477498834-30425-6-git-send-email-stuart.yoder@nxp.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1477498834-30425-1-git-send-email-stuart.yoder@nxp.com> References: <1477498834-30425-1-git-send-email-stuart.yoder@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131219728104915970;(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)(1109001)(1110001)(339900001)(189002)(199003)(5660300001)(8676002)(81166006)(106466001)(50226002)(97736004)(5003940100001)(11100500001)(81156014)(229853001)(2351001)(586003)(68736007)(8936002)(7846002)(305945005)(85426001)(8666005)(356003)(189998001)(77096005)(69596002)(6666003)(2906002)(105606002)(47776003)(87936001)(6916009)(575784001)(86362001)(7416002)(36756003)(48376002)(2950100002)(50986999)(626004)(104016004)(33646002)(92566002)(4326007)(76176999)(110136003)(19580405001)(50466002)(19580395003)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:CO2PR03MB2374;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD021;1:hImyIlE1tOKFd/8WqHVv7lwRGH1ndOh5sVtwhvmsQaT9C532gRDFFvLwK/nONPCqzX11Tr05Xv8bhiUPhm1BDAlOXopp0pEZGJEXDOSsYBV5tby5jpJNa750g3fUtAG5wdb9A2U+EXJoKUK+KqDTaa7u2eSL2UEPWIHKe2iYipQxwM/EXr7K+/HCyGjvVRsm0gajH+0EdO3DzQSGgPV+uWNVps6iBH7sjnbI7nVhaGoBgc6e4UymmB9NKZtq6rOetvnHVlUd3xN1JDRT+bDSTG4zI9m48lefJS4th45Ptmtpze6IUyRv4S/6zyrSsrK4xico05RjXQKndgSFGhI9vMRf5dgYB4COzmF0GoX8yfQ8f107gPTOsrs1Dk8QG7G8N0rX5pZFF+MyafDXzozFn8rgXux2C9u5jNXeujr7VK+5Oo5foeMW7psA+mrXXWdsbTBGFAjjD9Sg3/rslCwM3XCPGf6sKGT5yD3bX2xENCaVBv4YActbYJuY0CiCc3iWmdcgWbTrKCqr3ZPPvDzWGL8iJy+yJ/4fz6LW1HDK8NoSSu/5XWManwP+r+s9ZWidNQPwr/aciE3fwOD1RPVsVInySYGIOv6d8NBaRcwDI7zSHBedmLE9jZcnkZ9Z3N752B5pFNSKLf3T6yvBblvCk1agYULN2bGljO54sIFlTsavNbnMuV/cGxdE2N6vWcO9IZvhJay5eh7igZABYDZivg/Fxls2KoRfP26lx5IQHAg= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 4bb7214b-e6be-4654-8402-08d3fdbce3ae X-Microsoft-Exchange-Diagnostics: 1;CO2PR03MB2374;2:ICf+7Bgvgtx4uRl1ynfnVMR/T0+Eu2YNeYmNxPOPtoSErEodaiiTU5PkF+mhBO08WRpy5Ycg0XJ8SNPqGiFXQL3DHWsHV7KNslG/l7GMW0JOLJXwYZpCGGeBkAwAWwRw2jFqhtBVXqXg3hlYkn2Gl72bt3pcpJcosfv1Q2YBthfvyirEMdzKfhTsJFW2UCcAPzXoQ1ojZG4sAcX6QlBozQ==;3:jn6Yl5tBJPp1VNv4ms+XzSynnCc5iBPJkgCELQJvSfeeDlsAowJOc2xPM0rmeF8YzFzFoVa3KQTwFqDccGMMOjamenycuKhMF9dL6r+1RUI4aSKmpfSEEvnOiPIL+FxYdhkjzEsrovekgWuiwccyL1Pp5iNKsjkw4K2KrGkd0tWY2Hy2b6V6029y3E2/7fvAJkqR2hgsbiMQshHDlRNeCbDXsm9TDh1lFdX7W7LBJ0mbCw7xmF8mwCEIGUFm6hYO;25:6vAS3QT9VekhG6T+62b62htltZd5p+IMVjREc4qBk6oEuDVMt6A9ThVnBZOqVDuHf8o+c7PUUbRqgwPis4XKe6VzFPelKjljf7c3Qh0sjfahLSMGxTdVSjIcJc2QNRLRPPfGwlwqgBVag3eL17RCmrs8gPbym+XdpwW7H3IrObHUj3fhybVRWPPNokTnvEtV5SoucjbPgaMaEfNHURfCv86XPfFz64Joi3TSlPHMjIyzXq4RDmxyFHQmWXBHMNNYNGNm6Ap/36Ue2fydM3fxQQob8WZBqEh3Eiud07G/GnJjv5bSO2J4r5vEKJYf3I9tEwRAIFQZm9IVjAMR86C2cMVTIvJgB/NHrv/7DPApSglVh7AstoyNMS+DFInYsKPuaD0Qf18y9Rp03vi5tvlKzq9hdnEsMBoXpdo1903KwzWu027PbDSWPOF3iXm1Lxc0LFx3IbPojfnFHb6eNDbYXw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR03MB2374; X-Microsoft-Exchange-Diagnostics: 1;CO2PR03MB2374;31:MfIVNAcEDMJZKHd9oxjFfTVukcjUlzJ4XR1CyyyiDQP584o+b14Bhqs6VFA/t215VaDpX/LPQRSNHPoO7QGNpmDAICb6lBNHz+WcvKJSGuHrXYhoK5eHDZDFPMVOWHGt8AOqCeO3htSFk4Xer36N/gBLytuqRB7V410d8vocnajOSKxPrVdzasm6x4wERMFpVKQFzZA+EkYGNxQHycWjDL9nqn9ja13vCO2O6kEIuvAhm6y+f0KaXYV2woAJY/fQQfI5MIhKsZ99Ivlcn26+VQ==;4:O4IWvhKCpo1izSHd0eNShhuy/Bky/HbHCnMDi6pFlPJIQ12NgeOBSHTGznJaKgfpHzcfIJ4UWbuHjJU/jSeIDfsy24rTwpb276r3crUq0gXVnDceX8t4GKLWvP7yNJvdoi/SmiYl0S3n4F7I/Fva48qg1Un0BjpqqwQ0n6rxMikCn7mmAiKuVenq9ioY0itsMsLsoFeUdhdSpwszQ0HiecNR3pV0bV79eSvm6dZClw5z2QwcEIaPTRPRbrIMhrTUwU4Y6Mb6swK6G32Zg2PIIEnBDlKKwzD3NOjPfq7hbhTsiuxzFdYfS/zSPTNbWygjvHvRqAJIlh1fqm8ZnMW1fX7a8L3d0/9xtr3EtJJIgEyq7bhNa/WfYkdZvu97btZ7mIX2XspVGZB2/6EyAHkyggXCUeKqKGA+IcG0mWef2EoFKw8L+jF/zsddp7ijR4j1yoAvqd0TtdMujyGt2sJiKk7cGhSqYQ4cNc4tuPwxQwXuiQF9a0F+HjtxzatyFk37C3WFzSDAs+zhtj7WJfFWDo/uMkrGhg2bf6hHldg/BEdkDkYfzNqdnpcCL40G3FnRZso0mvqU5CIa09ZCdjwJyMUzv+FO+1gu2Lv58EqelUWOCUvoKT3JX5fLEhyE+B5w 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)(13017025)(13018025)(13023025)(5005006)(13015025)(8121501046)(13024025)(10201501046)(3002001)(6055026);SRVR:CO2PR03MB2374;BCL:0;PCL:0;RULEID:(400006);SRVR:CO2PR03MB2374; X-Forefront-PRVS: 0107098B6C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CO2PR03MB2374;23:OIsOzSyLy/Gj3KqHz8Nlk/9R1VEJn9clEXeSlYcIN?= =?us-ascii?Q?IiDRNzcD2hXjWqyBExMtnCU4Wl1WNB5upJr2vIbdhGWPSnF1SeK8agIOUZym?= =?us-ascii?Q?Q3Ainm9gitlRq3oYKECDt6pHe9AhqPpVYXXH+CkDkNwIY9xiWDspFD8BeSW/?= =?us-ascii?Q?sMECMu8dydDauWMlGWQqDZKm673R2aULMzrQIhj1SRWXoRENt+X0jctXLv5G?= =?us-ascii?Q?NfhfNyUOU1gRIBOhWNIcoAw/+Luo5aCCSXWutRbaO9SAwq9Afu8GtJi3kxZX?= =?us-ascii?Q?Q7uVNqValtrMfWRzT022ARIoUAt1tL2LfqkQujOn7aPt7wWmEC8xLmtrUuvv?= =?us-ascii?Q?7zLMlC9+rygoU3dAGiHWnZ60rC0zi4Lbq6XgqQWdTv1XrF7iV4aeNWpNBRUJ?= =?us-ascii?Q?xFHTAQ2v+1DPJ0WieEYstbxkxAPfHjmqWJz46sopqoB/R4pvD3/kSPCQA1dc?= =?us-ascii?Q?fsM65l5ZyjIMdxT3cA7l4t1JYOej5ieGrpF3TwRmZRnMfmuOcjeDJclJTBdL?= =?us-ascii?Q?gp2qPDousizPFhLgfdh8TzPVYTtaESHnQR0qJI+eWtChGUnhu0JVyjYK+DvJ?= =?us-ascii?Q?3toi0jiXEH1lOdv7a6sEk37pUEOClApNSqPGeqU1lyO/6R6ESId0ciyLPVDD?= =?us-ascii?Q?TEcZkuBnVl85qcFNGdUH/BL0oBgpwj34cRMqloZ+1WNkHkBe4VrZ39FZiffT?= =?us-ascii?Q?88Mf3byBiZQWwkTnx7QEtnfE7mxSmynQy6pYTF/1Wsq8Pyhkb88u+aOFfuyc?= =?us-ascii?Q?4rrTsqSovvbuLTzmVn/dU2bOVML+33ZDiAo0p2uL1jOM4KF8+3u20mYSjeew?= =?us-ascii?Q?mZB5rdQ4HqPXa8K6XwHmpOl3wDDFEotRU6377qKkKBFJMxArB8CVKBzUwPNx?= =?us-ascii?Q?LHJJF9dKIYdfZmhcX6khKSjwZxjLn8Jog0+PXmcT2x/RnHZTYkSEeqzWpPC7?= =?us-ascii?Q?pcDqAid76zWBG2DGH4Pay959RRVCAyetNsm6dZBtKilaKagWnT5FBjVZ+qWv?= =?us-ascii?Q?lejox77OVoyUoh2dhRETO96TMQgfJy9R44KxhrIDhIsCXOuOZno4GqE4ZtNc?= =?us-ascii?Q?v4YgP2KdKzbfRuyP0iPVziZssUFqHJ1QzV+IEUq3odi5RyCUG+dP/RfMnxcv?= =?us-ascii?Q?s8LtJwjlYomkGCkOsEtE17A9Mq/c17uqKhV/62w5kmrLblvZwWlNt6LeJhqa?= =?us-ascii?Q?Nn+cKrMziMLev9cTIiRpWBwKpsY4baUHE4g1JtJq0IOwhcbB8ECaWHGpGdZ8?= =?us-ascii?Q?mJD1w/14AKg1WmzEAWXINKbyl4pU+hyR7x+zgor?= X-Microsoft-Exchange-Diagnostics: 1;CO2PR03MB2374;6:OioRYDNRk7hvZPGTGZ4nF6z4n5XD39NnW52dET34Uw/qNOwk8+owNxbPoOuUlYy9Mt86hCEt6w7bh9GxQdjk+IwcFTynOWtebDsIrgkjfWRhkqEvHmXSNDQ/QQjQcqYB645BCUVPK/kYriA5HqJ3h2s0S5xFO4Rc+CdgZDjjrBhXXp+TpfzjnqgDApYGlOFiaxN+BTNMjtyKg8DpvhA6QAASRM/zJMsxvFoa9mumocfm5dSB8EcSpqQhrFEtzlwD9bLtiSHcAShdolRg3aMRMzArYODyjRWEa68nU2GUQTGhKzhqtTLxRu9MVDCjB3lv;5:ordkPBnJ6DsqBugXV9BLzLEa4Te/ll+kJjm0brkCnLElHwSZDElcnprIknCmDncYHIMmGE+zRQQNiVobcOh0+hP85dMT6QqLivIfJ6yBSDzxLLOIFHu8yIZbn0V4qDRMOgcf9agWxBsaDkmMNfzjUQ+GaS/kapq1c4Yruxx9l1jEpw7KMPgfN6glYc18buJs;24:z2M/iEt0lI8yvSDoQFbifN589w7Kj6hb80lPU5jNJI5JTHOkwu2sr73xcXudJIbYOgYnsxs58XBYXSDyAQbVNubpxwefYW4s0/MBS9Ky1YI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CO2PR03MB2374;7:wDdmxLEexZPHkyz9H5AIJS8HhggR91qaYF8yP5k/c4M3c58jsY3Em1PbCJbPrflCgyrdRMiWzYl1GG7d79Rfhv1eQfrTZQmzj+AmRGBCJu/ePD5cjm7WVPY1A5ew07DwRA5rq884hZRXDhzahZsmnP1lTxZw2DfnmpvElvvCquhOjezQKl/4d5AVMb+X9EY0PypGvtZ8wwaqHgLOrkb1qm0T4WRFaAwHjxM4TOFxVViD5+lLdwdGiB7qcctVl7x3eoKS1EJBq181nDKK95Vrgc7LnJi97cLVbFXNudSl4b72d20hehgYR6N6ZZglOSxQ2cRndBscd8KATTGRurn6KIKb4YC7biYd2Q0eobEOFYE= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2016 16:26:50.3823 (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: CO2PR03MB2374 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ioana Ciornei To improve readability for structs and function definitions, separate type and variable name by a single space, instead of an inconsistent number of tabs. Signed-off-by: Ioana Ciornei Signed-off-by: Stuart Yoder --- -v2 -patch is result of split of original patch, updated commit messasge to reflect the change drivers/staging/fsl-mc/bus/dpmcp.h | 104 +++++----- drivers/staging/fsl-mc/include/dpbp.h | 144 +++++++------- drivers/staging/fsl-mc/include/dpmng.h | 12 +- drivers/staging/fsl-mc/include/dprc.h | 342 ++++++++++++++++----------------- 4 files changed, 301 insertions(+), 301 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/dpmcp.h b/drivers/staging/fsl-mc/bus/dpmcp.h index 0a24c37..c0e6017 100644 --- a/drivers/staging/fsl-mc/bus/dpmcp.h +++ b/drivers/staging/fsl-mc/bus/dpmcp.h @@ -58,10 +58,10 @@ struct dpmcp_cfg { int portal_id; }; -int dpmcp_create(struct fsl_mc_io *mc_io, - u32 cmd_flags, +int dpmcp_create(struct fsl_mc_io *mc_io, + u32 cmd_flags, const struct dpmcp_cfg *cfg, - u16 *token); + u16 *token); int dpmcp_destroy(struct fsl_mc_io *mc_io, u32 cmd_flags, @@ -84,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 @@ -150,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/include/dpbp.h b/drivers/staging/fsl-mc/include/dpbp.h index e14e85a..3ae6405 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(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); + 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..5034317 100644 --- a/drivers/staging/fsl-mc/include/dpmng.h +++ b/drivers/staging/fsl-mc/include/dpmng.h @@ -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 c40abcd..a3aa6f9 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, @@ -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, - struct dprc_attributes *attributes); +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 */ @@ -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 */ @@ -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_res_count(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - char *type, - int *res_count); +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); /** * 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_set_obj_label(struct fsl_mc_io *mc_io, - u32 cmd_flags, - u16 token, - char *obj_type, - int obj_id, - char *label); +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); /** * 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