From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933015AbcHWWen (ORCPT ); Tue, 23 Aug 2016 18:34:43 -0400 Received: from mail-cys01nam02on0069.outbound.protection.outlook.com ([104.47.37.69]:28447 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932241AbcHWWdk (ORCPT ); Tue, 23 Aug 2016 18:33:40 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) 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 14/14] staging: fsl-mc: make order of includes consistent Date: Tue, 23 Aug 2016 17:14:23 -0500 Message-ID: <1471990463-28912-1-git-send-email-stuart.yoder@nxp.com> X-Mailer: git-send-email 1.9.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131164642872190770;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(5660300001)(586003)(4326007)(189998001)(110136002)(92566002)(2906002)(104016004)(85426001)(86362001)(19580405001)(50466002)(106466001)(11100500001)(2351001)(8936002)(33646002)(77096005)(81166006)(48376002)(81156014)(8676002)(31430400001)(97736004)(356003)(7846002)(5003940100001)(50986999)(8666005)(36756003)(19580395003)(68736007)(229853001)(87936001)(626004)(105606002)(47776003)(50226002)(305945005)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR03MB2234;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD006;1:hRILWocMSKvAZVyy1hqd+RC8phdYfjTaxe88KBFfHPfAA5HO+eFXlELt3fkZrJSjJO6S4yKNCukR7ahPrvchNtyar1MOMeo6Zy/l5vQUKv6KMk4HvJHj14UvlpMmadht/HXctgiNR33uGkvze/k2ED2URaKISIG9duFxP0Ed20nCn3qwgodCvAML2Zxh7PLMnDQ9L9q8id7a0W46FDPH/Sr3qa37izALlNdET4meE9iyD5MnTWzh4iBJe2tUJWbS8K+he3wsu7BQA447gcvXCNFJNto8W7u0ZxABTjMzyvqHAC/vI8BFvo2NZityFWdCjVWTPxg/Gl2/4dPapVGN55zAoVH+32EkOQWOt+18Yv2UZE/h/zf+qb5ImHjYKs8MGXdsNCyuy7d6t2ja1OQimIHNvprAPgD2KCUdEpO+igY4i0qwvyWJSVREY1Kck9lhBfjTB8Hu3OzHYyktzNADVquCmek0hFOvVekf144MoocM9Y82uSpHDxeME7EAHJ/V4GrvGIfpjDVzd9hdsaSYSwJaRzrl9ePKNQZ1qdszXD4reAgSZDhh6G59/lzhth75sfLY17r4okh1IgP/qBqxCbg3YFdqwxmBRLiIao7BYUiVbBsLUX4RoNkz1Epp7T13+ylr9E3oY/g1+hrwD/Tl38MWt3qD8uRYleSsP5jGUQGKPiq5Wdc5uQi6KboH3nWjWcnUoQE00iXfqrjsqOa7sjVeU4Y+6INvoG5rRcKjjNU= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: e8214d49-a0d1-4be9-1968-08d3cba35bdc X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2234;2:zzTCCo6NkKhd2BT4IZotAW/tpaKcnyuGeeAiIngThQfbLvp0kz+u6p54Zm3/oOt8r84rjoknKcZJL1jM74ccA8vq3JGtZCGikd1CroUa032T5a6YiyHyGttGs9AZ6ORUtgR3HHmxsKFms9hhs5SveluRIz3nAf8MLoxScOZ9l/9Fq6yDgchZzbt3i5XALJzP;3:rNLXqViZo5wFkwIn5r3I4fYZmHy/TxUnX6YWTv4eiC2DiQF/g40oOPIE/JFfZ7VD8e4+DPTuFB20gcZ234TR6e6V9olNDcUZyzRc4LnqUE2IDTV34ynxtwe5Buej/hyuwGic7vxKCNV3cPlcIkpzA2Kdxp/lE+KqauLYsH+wvLzmuoqzbBF/0cp6fSseL6DJKzzkUu8s2gYxWS7RGZSmaiBTyUWkdiMk99/+fJLj8LM=;25:UA/qDszBPT3bRh5jZuibchYsir8lkq0nABRAnSGi5tjUdQWQOxTtNlRejfPrcGbW80g0OJ3RZQn6q1sIUh/qz6vGYOS+TEaqyA2/ZN+mMbcSVUvZ2+fSVivwznSpEKi88DAYfStMttvCTvtZYBMeyhKh+u8YvwmCH7MKTcLCygDQPb4/szM+vFfFQ/E4n9T16cw7IdNHkmBhyOmP5BuuOvKR7yLBP0+X66At/12t7vS1Akk+/KM/9IfutXkQFPtaYBdw7V7sNNMFRd/KBQcXpiuTblDu95rBW3IIJDCZv8K6UboXketiX3VraiOw9Ocl/hA2AqPHR74iS+pjOWHms2GtlZTTAaYZ6lS2Xuoqre0/N4mIvR4lfaN9/TbXx2hXvPRXrUQzS0XK4/OrYlweFvcDfitNZbqlHJ9p3O0qNyc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB2234; X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2234;31:8qDUkNR1T4pnkTIG1H5pCkRSaMCq5Sw3yYOGwVMxtq2x77nQ8WUKxqAwOZ+vK7mCMb0wHJnwYVMnul9+jfRbMg9iC0p9ohX6jlX0nz9CuGX91G0zEH/QrZ6AICJF9UzGRj1GXK9B2grw78GTLA8RDbA2+21ry/FD/ojxX6qjrmHHGZLRfnZr/6X4wIvNxoDw9YEMjdMXRvNeuA93Sd5P18jB59+pnNm8b4+0Mn0QUsE=;4:DVwiBplu4P9mb60Vn3mioRcap+VnQtsOqj3bho+bdW3KIaiEHjaOJWej836FRq8PVYtqRfPFfhRB2w/JezVTZItUVRg5JwL1rsyjWMtG1Z7HIqQV/w/V4U+73pibOmVVeHvKMX+fVNedjB+dB1BGvzjI+MKh2ghNNAT5M1M3aBYpG2eXHkFfph/N8fByVGkchQMl19w3cMCn3YPzj+6YlxRZBsNnleULcYS1QUF9B3jDFzktaEoxrm1/IktY9qeionOXmQIzOYzZ39MiLEk3MWoHEA3sh9In78rR18ffRuLhHTc5gYsokCF7N7j1mCf0H3e/kypCxQPcmYl6tLn588mq33zuMAZFgHBH6jLZbPj6bKrs9EtN3HN4L/pW1jM/jZDhidNwGaqPEw9s5vCRNQO2H/fxKjmni0C+069psdr5zl5nfRH0330WpYg+SGaWjochZzuGKJoj+niBSr/LXAdw4tiNCKjhRIUF2tbyRqR1i7FqIHe184vPaW5RcWph48arPoXig0lbB3UYIPbz6ZfxYWVFTfay+MGtiX7tmF8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(13015025)(13017025)(13023025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026);SRVR:CY1PR03MB2234;BCL:0;PCL:0;RULEID:(400006);SRVR:CY1PR03MB2234; X-Forefront-PRVS: 004395A01C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR03MB2234;23:+YSC6d3xbS1oOhvjXkwd7JEqYDq0dDMz+hQRU9R5o?= =?us-ascii?Q?kewK16ekfdhdmjX4BuLJQLl/bT+4u+0bv5po3F3VOFJ9o7Z8kit0EztjRM7l?= =?us-ascii?Q?K/NoTCAm9cNa6tvS8BmQGnSYYdHOERjCv3qUHpe0Aci1POpXr/p6EZ2wg2xD?= =?us-ascii?Q?EBReOJ2ah6jkxQF90+8hQLrlQJDWzXI5Uoo10LJsehH/l4+/fdL0/XHiDhxi?= =?us-ascii?Q?0MZm8YWA/M2BoTRbJILUyPY9KLzl762fWdqKnnRPNcV5zEJDu19uSSXHrKhW?= =?us-ascii?Q?l18ogrrc0Vr2PCYqfmCDQwTwcDmQsl8SEpJuhKCKwSP1IhEWlJDGa/VQSaHw?= =?us-ascii?Q?CaZwZh30V3qwWWj95NIQk5gEMF/VrTEcJUmnxyeOssEwse/QjFkwY8sw2qAO?= =?us-ascii?Q?8mxKT2P0ndOvSwfZGuZBXQQhk64dJ7eMJp6gdp2b0zSoWlyaVd3aiCo8huQP?= =?us-ascii?Q?AhXlozEpsUf5UkbPvVa/hBX/tEbqxSEMbuEYzPqum57DkZP57GT84p6cmUqz?= =?us-ascii?Q?RAXmz82a+IqmPNQkeVQT9j+mJw5eZq0ioxPBt9YANJpTSxP9eVTfKLrsM8zB?= =?us-ascii?Q?uGGzMm42IUg219j/YRIIvqOB/RltfIhyBfTNeWJ1DtJWie33jZizHZsAOrMv?= =?us-ascii?Q?yVBqss9lXzdYYIiVaC+Tqcx0HMOB9dgifEYbKeR70vgY6zhiYRNgETNhhUIh?= =?us-ascii?Q?iYZU5zhM+61evAFSHqs6VZvq1qSjJz/ThoYHXjPViyeRc2+UhfvzXrI/Jyoq?= =?us-ascii?Q?6cjP/mnUHpEK12BrNZY3ngdBN6aal98wtnCircT6RPbi3WN1xyfD61frBOJa?= =?us-ascii?Q?T7usdNcyOK+Ydn+CbxLnSJGC7wJb74GiyXRLEZRfKWuTAH7vLqXbVwCFQgyK?= =?us-ascii?Q?XTCh2WPMcd+yo2pIuKAoRyfsdAk/KV/lf+BMCJEB5/Fc6xLM0yc5jDSYfU3P?= =?us-ascii?Q?DTNdR6YHdXyzVl4TTsUmPWucvbpvNqCG4ZydZurtRJQ+LS4I1p8LF/BasjsR?= =?us-ascii?Q?LMeh7Mfb93DcSE6KEDcVXvQK0UlS5lw5aEm3n3OZPSKYXYC9JddtPe6jTk1o?= =?us-ascii?Q?+JQlktkvxmuT2PW70XAE09SUiZG1oV6L/DwvumgcZ1BAqcnbgYcFltkPqDd/?= =?us-ascii?Q?G5cHgjKWY6KNqaKaazecx1VAhOyqePvE60JqR9ypKq6mzplnCsxAQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2234;6:hLne7uNssi/Exvt/HnsjQvIFIx90SuPRsVWTkteNOkC4AYCV96sozDhckycyDFb1/AdUyd1GGa0Wk/hzNhi5Hn1+6KP96YdtMgwdsy0nEuW4DUZzud9iTGhQWO1NGUxBZ9gcDXZgq2s7a/lqSk0XTG6xu2Rm5UcX/KPS0czRyDvtzQOMdx2tnb/lVh5UJ5eDMVVoz8k/ZobRE/Vr0IqpQfZC5fYNS6zYHIMlBLV+YhLJQkOiDsLJ/ap/CRNRcT7Sunn/1tHbJHnpJAW6RFfe5BoAYJVG4BwgLs6pYYlbFns=;5:TFYL1wCkt2dSVtZRzhBCTvdk2LZ3E8p3jpKQP7xtZvOyEMHlureG/wmYDgrextOr6WIPcjDLgMMOcBrMRVHzWQ4CHqaGntPgzKEZHd/aSaPXVRCBmO/HAEDY8K2JU72GeOdj7bm6xmbxhVjmWWX7Vipb7N1kQm1ErXB8ajiXtCE=;24:HhyGvrS50S+0AQkmFVOHUf8g3IetJSdCCW7/qTGBGheEh3QuSlR8OZs//ZsnAQ/FyHI3KXE4P/Vo/aVjpj2kygLrG/b+5BEja7Icw4hHUts=;7:rrrhxmfTE0oRLXIFF68Y/oMapi5/rX+kEFi5D/lXeyHvkQCy3QaQYkGY1UnZDIxTv0co9huzkzwa3FYTQNj/Y8/NMfBeUR9VU+p7piMVBRW17NVvKEkZc7OeOG8sXqv+q0eAIVH1jwqVoi4mPlGd4mc8a791O06+UtG18lMGSYpme5eaCFsgH0otyRPfi15tjPLCU6tjR8QGjBMgr7UJN9I/ATj2K1RtuRZMAWCyWX0NWP59jEf+ub0ADpnwCBpz SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2016 22:18:06.8758 (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.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2234 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are 3 kinds of headers included in the bus driver components-- misc linux/include files, public bus driver includes, and includes private to the bus driver. Cleanup the order and formatting of includes in the bus driver to be consistent: #include #include ../include/[file].h // public bus driver includes (eventually // destined for: linux/include/fsl) [blank line] #include "[file].h" // private bus driver includes Signed-off-by: Stuart Yoder --- drivers/staging/fsl-mc/bus/dpmcp.c | 1 + drivers/staging/fsl-mc/bus/dpmng.c | 1 + drivers/staging/fsl-mc/bus/dprc-driver.c | 5 +++-- drivers/staging/fsl-mc/bus/dprc.c | 1 + drivers/staging/fsl-mc/bus/fsl-mc-allocator.c | 5 +++-- drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 3 ++- drivers/staging/fsl-mc/bus/fsl-mc-msi.c | 2 +- drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 2 +- drivers/staging/fsl-mc/bus/mc-io.c | 2 +- drivers/staging/fsl-mc/bus/mc-sys.c | 6 +++--- 10 files changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/dpmcp.c b/drivers/staging/fsl-mc/bus/dpmcp.c index 0644017..bd63baa 100644 --- a/drivers/staging/fsl-mc/bus/dpmcp.c +++ b/drivers/staging/fsl-mc/bus/dpmcp.c @@ -31,6 +31,7 @@ */ #include "../include/mc-sys.h" #include "../include/mc-cmd.h" + #include "dpmcp.h" #include "dpmcp-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/dpmng.c b/drivers/staging/fsl-mc/bus/dpmng.c index 660bbe7..669f604 100644 --- a/drivers/staging/fsl-mc/bus/dpmng.c +++ b/drivers/staging/fsl-mc/bus/dpmng.c @@ -32,6 +32,7 @@ #include "../include/mc-sys.h" #include "../include/mc-cmd.h" #include "../include/dpmng.h" + #include "dpmng-cmd.h" /** diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c index 5e34720..c5ee463 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c @@ -9,12 +9,13 @@ * warranty of any kind, whether express or implied. */ -#include "../include/mc-bus.h" -#include "../include/mc-sys.h" #include #include #include #include +#include "../include/mc-bus.h" +#include "../include/mc-sys.h" + #include "dprc-cmd.h" #include "fsl-mc-private.h" diff --git a/drivers/staging/fsl-mc/bus/dprc.c b/drivers/staging/fsl-mc/bus/dprc.c index c260549..ac4ed35 100644 --- a/drivers/staging/fsl-mc/bus/dprc.c +++ b/drivers/staging/fsl-mc/bus/dprc.c @@ -32,6 +32,7 @@ #include "../include/mc-sys.h" #include "../include/mc-cmd.h" #include "../include/dprc.h" + #include "dprc-cmd.h" /** diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c index edcb5cc..2004fa7 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c @@ -8,13 +8,14 @@ * warranty of any kind, whether express or implied. */ +#include +#include #include "../include/mc-bus.h" #include "../include/mc-sys.h" -#include #include "../include/dpbp-cmd.h" #include "../include/dpcon-cmd.h" + #include "fsl-mc-private.h" -#include #define FSL_MC_IS_ALLOCATABLE(_obj_type) \ (strcmp(_obj_type, "dpbp") == 0 || \ diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c index 9023df3..03ebab8 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c @@ -9,7 +9,6 @@ * warranty of any kind, whether express or implied. */ -#include "../include/mc-bus.h" #include #include #include @@ -19,8 +18,10 @@ #include #include #include +#include "../include/mc-bus.h" #include "../include/dpmng.h" #include "../include/mc-sys.h" + #include "fsl-mc-private.h" #include "dprc-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c index 7c20f60..cc19092 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c @@ -9,7 +9,6 @@ * warranty of any kind, whether express or implied. */ -#include "../include/mc-bus.h" #include #include #include @@ -17,6 +16,7 @@ #include #include #include +#include "../include/mc-bus.h" /* * Generate a unique ID identifying the interrupt (only used within the MSI diff --git a/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c b/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c index 2586328..7a6ac64 100644 --- a/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c +++ b/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c @@ -9,7 +9,6 @@ * warranty of any kind, whether express or implied. */ -#include "../include/mc-bus.h" #include #include #include @@ -17,6 +16,7 @@ #include #include #include +#include "../include/mc-bus.h" static struct irq_chip its_msi_irq_chip = { .name = "fsl-mc-bus-msi", diff --git a/drivers/staging/fsl-mc/bus/mc-io.c b/drivers/staging/fsl-mc/bus/mc-io.c index fd032c1..798c965 100644 --- a/drivers/staging/fsl-mc/bus/mc-io.c +++ b/drivers/staging/fsl-mc/bus/mc-io.c @@ -30,9 +30,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include #include "../include/mc-bus.h" #include "../include/mc-sys.h" -#include #include "fsl-mc-private.h" #include "dpmcp.h" diff --git a/drivers/staging/fsl-mc/bus/mc-sys.c b/drivers/staging/fsl-mc/bus/mc-sys.c index 461abaa..285917c 100644 --- a/drivers/staging/fsl-mc/bus/mc-sys.c +++ b/drivers/staging/fsl-mc/bus/mc-sys.c @@ -32,14 +32,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/mc.h" #include #include #include #include #include +#include "../include/mc-sys.h" +#include "../include/mc-cmd.h" +#include "../include/mc.h" #include "dpmcp.h" -- 1.9.0