From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932836AbcHWWd7 (ORCPT ); Tue, 23 Aug 2016 18:33:59 -0400 Received: from mail-cys01nam02on0059.outbound.protection.outlook.com ([104.47.37.59]:59219 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754326AbcHWWdb (ORCPT ); Tue, 23 Aug 2016 18:33:31 -0400 X-Greylist: delayed 993 seconds by postgrey-1.27 at vger.kernel.org; Tue, 23 Aug 2016 18:33:30 EDT 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 10/14] staging: fsl-mc: move bus definitions from mc.h to mc-bus.h Date: Tue, 23 Aug 2016 17:13:59 -0500 Message-ID: <1471990439-28720-1-git-send-email-stuart.yoder@nxp.com> X-Mailer: git-send-email 1.9.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131164642623618270;(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)(586003)(97736004)(5660300001)(86362001)(189998001)(110136002)(50466002)(5003940100001)(48376002)(68736007)(92566002)(33646002)(105606002)(87936001)(19580405001)(8676002)(11100500001)(356003)(50226002)(36756003)(4326007)(7846002)(50986999)(305945005)(229853001)(19580395003)(81156014)(81166006)(106466001)(47776003)(104016004)(2351001)(626004)(77096005)(2906002)(8936002)(8666005)(85426001)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:BL2PR03MB435;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD015;1:o3GiOnhdV10XLwKI7uFFXZMrX5+xDh6mW2npGVYdMpG1yIsTx3SBkVZNShNk706UXcTtTdwNWSrSeNFOrEq/GbXXUVcoVvb/ji8pt2Kp+K+qazDSZe8AuWI3NU0w00ssKR/lLiXkcew4wSlkL0XYapriPV3ESjHatJGVnRcdRCvoqRaAW4iZ4tkleio66HqpwoYCgAC7zomRH/99FAOuAMPGhVe8yXBZnroNz8BDP9trnlHEfZTlvZEAABV66GNZ33Dy54vICJftDkaMpShCr31XPc47ZRjoCVeGJ4MX5dcLcXIlSO38qGobTOZWiGNZjPi1P8jGg1//8OHsbeMezdbUDYppfC+u1xQB22THmy67NLv6t1unjmqh8d7ZHOB92WRPIjzeUDfJkNy12rQgoqE/ekqpUnkoBb2zI5N/ztCTyQRK+PWflxCt5xV5My9OS4U59wA/Wn77W1PYdgo3sgVX0l5saPTmL5dje+DnmyK1ZGPGcwEdManxWv/SHatqv5caYa43Hc8OaADWmeij8JsvpseAhonDSG5J/H4bqotGuKuNfKrmhp9dDBULOAJl6PfTLxlHlq2u/iGYCaFG7mcjBTCeebD4wCzq7yaVkWwXk60WY89lwjBkIhlSXDh1lGqQYowR8hdKJMvQ7B6e/NX//8zSGwJJ6IrQVaENzvpZhM3BlU52WPfREx1OHNhJbv5UOGoCvIsDcsEqwTTGUkwAPs4+K2vAU+T1W7t7whA= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 13c74eb6-030a-4d2b-f1ce-08d3cba34d0f X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB435;2:0ucB3kpuv3pAM9I6nPpyOQ7JQeqHIUJdpqCy6qrCPLCnGartRGF+IhC4AXdO0aDxLE7SiQTMdppN8umaV5PTzJTv5ocOTfD+ImfEDEWKHs3D3wMZMjh/7IG2jZIRndbJ41ATM3E9OO9+sPGmZE9VhwkjHhZwZaCr8gXBlGNMLmZDo16Xqt5aLdMr+Szm7os0;3:1vw06qU/67FSKYgqeqeGCjQVqnEVyJ+ERSx6R2FwoLHs2l6zaDXdJZUyBopnZQEGajBUEk3xIi7lo8Tc/1z93DF9fYZ0wMb2jrwK5EeuxMEu/3Gz3aUyyTIAjFcThX8T6KUIh22MTlzJHTu2WC6PMd3uIrfnRJRbwaC+4zP7W/qZRB16v/jz7dLej4qzGiwLukECnX/TzpWKBGzxXaYMQC/6Bx850j8S0biUxvfKB9o= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB435; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB435;25:HyBrAxzq+SJgOFzXM3xMEFURSjeydMjEBAMBx+rgY3qbh8Ga7fd5JmaSbBp0MpiiUyUpe4rUul9jMSpgkbtZkwwcyWDosmJfzySuvJlX5dMkDaDJNGhG3rorz/WgQ948DtwNvlaxixEatVVfEwMWeC7e0XActsH1HDzoEjyNt8/g6o8cW5hgAnIyKlBHUnYyW1IjfWpZInDJfgkHqeHpXMecCXGdMM7gfvymbb3Pje7LHRfj62j0sPUJ7RBac9MrhFOOWA9CxysCFSIeDFuqVDyM04rryFM7tSYQ5ftlADkA02vWyarJBrfH3LfyKdCGE8Mh+A7cU6AYRdO3CvweT5JEzI+nppRKxqLetZ9War9tZ5/XGWH1lzNrt/2SmOe1utBd5qmGFF9T96uXQAGFhue5imYRq23rs7Ydmwe80nYI2G9vdbFvi1r/RFQvc89I1GpHNPcCbxgMTOVzVeWBL3ESkSq9zqzsDUMJNBcuoXnr0X7EgMmfpbP2qfEMq0aHGu0bnzzPktSHBIBlYaBa83nR5SYqsJGw2ooWVcbL8mueCxYPF2CFK3p9rZEsnDS4WI0NNcmhr4IrcKr1kicCZxB6PjysIN5+TQn2LYExWAsyFLIaUg9786IIjfpLvKpK9aCnKSzTLm3jHZqnmPUzhdcPBhAU7+2+rZy1yO5bZ8s4SKpc04tsSWNK1vN4HR52DyM7P/PE3IQynGUuAMNOSnLPhm2tlP7ALtWQsR3gOgI= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB435;31:X4c8088yHO1ept3K5B4yqATvZHKKvxagEVwZz8yEWi4R3Cr5FAAOnTI2t1+d/HKfLUfT87uS+Hld/3+fIbU09dRm3ueXGKJwyZVvd0nc6VXbEeED5KaHmyAS/yuKj9PMP7ET6L60sSANIWX9jlXN/BGM/4adh7T5EecCN8vLqXx+eDnj0dys0aNDFSmCyuM9m0tmlwjGexHhqlQo+tesqWTlzp/jFBx/u23ZVbc/vMs=;4:w8Uc4gjIQH6ToomoZwtJYLL90X998WZfkYmBSmoWEDPsBANZVy0/HiWMG44PASl0EtZeurfUGxzKEFg0Xmu9x0G0V2t0XfQ/q6M2zW6Y48o9DICMB79tY3k0W/GFzHadaMrPMUb2W4NsmY20jvKMLGO/rKszjIQDcdq0QR4phVvjWeTjjiYVmpbbBYcQmH2eWVq/EHO+S9OkO0EbDXR1HcFJt1umllYFGv2L2n6umWPLshYw1XqQg67BQ9ZZcMzqEMn2dSduQkEbpyVt0zf3RxQS3Msofi1+JuJjImukKvTKmdnDc3q0L6toOc/UViDPMiFCtCRa5k5z86jCatxL1d2aoinA9McijCf77L8RjAiRgOlo5c7etT122a+J4xMwBIfP8ZfnggjjQSQTRXdWbEbmlsbgGw9bDPBGinZAGvMK8ayrEFvTgq/BCHIAib4W5aKMs7abAnHQQOHl2Kh24I7lOQjKlFJNrdG4prwmGtf2Jk0LbRuH5dxZOuwiB3PnAnfz184rMYmSAZr8bv+cl9xS6LD1+ylXhx/KY0vdg1A= 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:BL2PR03MB435;BCL:0;PCL:0;RULEID:(400006);SRVR:BL2PR03MB435; X-Forefront-PRVS: 004395A01C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR03MB435;23:G9YmuuWUMuHa+ijUP36ugpPwjPf532s5RYgc1VKZ37?= =?us-ascii?Q?afElKmNYB8fcGXbmKiHZSrv37vc+NpQUdAg/7pNKIlDKzsVLBLJ36hEH0gVV?= =?us-ascii?Q?JEJsrpFaNE0R06UlukoEX6mac6vYmnQBphb6IBbOYZgPqRgP/mzdNlqRhsJj?= =?us-ascii?Q?zU4Kznsrck3cVXBusTSzj3boslI9vpp4dYtZenYAX8rMj1wXvjM2KKcfqXsY?= =?us-ascii?Q?fvrhVJRQ0qLuruYShsitKOP8URlwq+xIdDk7JQde2ESuMCN2Pbq2UYyl4dnW?= =?us-ascii?Q?KTlnrIQwPxIVupRU6qAm2tEQEF/N89XDfSqcNRM9SgZAiQj5dA2FTpWKsZzI?= =?us-ascii?Q?Sf+eIgkrWTKYpzB1a38XOF0rqiUmvEGy1S1PreAQVhPGlOyvW0Z7kpl7QgNM?= =?us-ascii?Q?EFZCPAZ4V/6T4S/Z2qef/5j2k8P3BEjVfygtoyDKz/JqKQhJ4tCoa7uozROz?= =?us-ascii?Q?/KYz/7VtG6suIoAothRLt/nOaHg7g3E95gKEojG57qSs4m0F+0BBsXGTGOyt?= =?us-ascii?Q?wC2x4jQTwSX2UEU5j1ofwc9z0+GJr90grO2DZj0EaiGWL5TWlxvpMuSzWrBO?= =?us-ascii?Q?QJ+gbdD2g4kyub2AQyWirKXGq+9+o1ctfGIaaG9yl2TmsJAlb/vevMvsll7V?= =?us-ascii?Q?KL55D+J9FnBuA26DDW7gHGjkeeYhpbdMEMC/RRzSkKsLXWejf2yuaOh1H3Wg?= =?us-ascii?Q?t8sMZeRX8/8LNjDhS7vYCnMNUj6KPFwWCxZLXRAmACCwoiN524KBjnmnrgRN?= =?us-ascii?Q?0q2/XP7oTsY5Q5apQldg/yAwcCiG4k8UlmMVdhANfbtVs2dYTuMR0jpu1jxz?= =?us-ascii?Q?eh40TnUelyNCJfdWnOUnru9Z5yuf4xZD5qMVlTGeOlfg+kbZ8deE2S5TCheq?= =?us-ascii?Q?zt4guhN6XX8L6PFaQwRz6sDrTaOK2Qi8+q8Kq/Yf+/o4Y1mAIyv3csvCL8+A?= =?us-ascii?Q?8kTN8Z7t6bi8aLqTiURG+qs/9R+UKegLb3DOElpP3zZJS+8cbrrcz482+mvF?= =?us-ascii?Q?ytw5Tbsh2PxQfoq5RIRbDx7bIdytYHSpZ12ZhmtZbwdI0/q5Sa4wKjvAV8Nt?= =?us-ascii?Q?49zG3YbDMqMRjMCctsA5y6MKCJYYfa6D4AXQzbqEDorIv4vPbg4KOxkVhC1L?= =?us-ascii?Q?Lp7VLzNuw=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB435;6:e1Ggl/yPFh1VtHMjmEuCL0OTnOrZq3neLWdaxOTDWsVh9UihEqMbhIHz4fJnWLkr3L+SvWwTl8I8fE9yvdBxhVJ9ZBAw2kvkNqVel0FBXQUiXIQhuUiPkn8lgnOEpJd32K13VhtCEicnAKlsnmdu2puToxFksgovOYH8fMRhxXMz5uI/wAdB4aGeILCmkoohjjTcT9jT0ESFufsPtCmXHhylKSgqwLTltsGEDvSIP/rm2DFReVEU/g9zfivE4MXCB2OMl7ydNdmOKiIbQ+MzXllFZGZC3CnlcbUKVh1uAXo=;5:3cr2XabKhBm2oVDzhOs0+NsXLysmktRIDzjdBwPIAb1LaLXnjVvejULS0J2UCJsDBg+1MhmTA/VtHwex4iX3ZghbS1KPgTm1NxVKeecqAwygQ46iKs60BYU7H7qHbUSvVGxx9UEmnZEGJPG7CVwPcrze+4ca9+4BoM/OppyIO9U=;24:KMLhkQLfsgQV4qOKjD6dE/8xw0DsvhzxdgR2Y/Jq+frLocurUUk7Oh3biCBKf47YpzXPGXVxmPa9NAkTCQdbZM+ZBkBa+X1wrUDvh7kipmE=;7:gJeVOeCmw/nOVxP3b/WXor5EJPealni/lfEgevoFXo75Hqy/ijYIkAmyQEBpdLroODOMWgN8/dfg7O/lNQ69UTu3Zjt1Cya9ZIYhFsrcBdgw5VnnWy9ON50kUBugUJ18nZSWKUh9Yl+1xsm+6NB8SN45luRKRxsOPu3mMpyPBKd4ve+l0ErfK7WOL1Eze+1C78bb9kag0XtkNZYFw/yWD5TTT7Tz9LBPuCL5oskQHIw/xTRlab20nJFESOEeXFiB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2016 22:17:42.0498 (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: BL2PR03MB435 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org move public bus-related definitions to the proper mc-bus.h header. Signed-off-by: Stuart Yoder --- drivers/staging/fsl-mc/include/mc-bus.h | 16 ++++++++++++++++ drivers/staging/fsl-mc/include/mc.h | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/fsl-mc/include/mc-bus.h b/drivers/staging/fsl-mc/include/mc-bus.h index 7eba588..2cdb538 100644 --- a/drivers/staging/fsl-mc/include/mc-bus.h +++ b/drivers/staging/fsl-mc/include/mc-bus.h @@ -24,6 +24,13 @@ struct msi_domain_info; */ #define FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS 256 +#ifdef CONFIG_FSL_MC_BUS +#define dev_is_fsl_mc(_dev) ((_dev)->bus == &fsl_mc_bus_type) +#else +/* If fsl-mc bus is not present device cannot belong to fsl-mc bus */ +#define dev_is_fsl_mc(_dev) (0) +#endif + /** * struct fsl_mc_resource_pool - Pool of MC resources of a given * type @@ -93,4 +100,13 @@ void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev); void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev); +bool fsl_mc_bus_exists(void); + +void fsl_mc_get_root_dprc(struct device *dev, + struct device **root_dprc_dev); + +bool fsl_mc_is_root_dprc(struct device *dev); + +extern struct bus_type fsl_mc_bus_type; + #endif /* _FSL_MC_MCBUS_H_ */ diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h index b093aba..789e6a8 100644 --- a/drivers/staging/fsl-mc/include/mc.h +++ b/drivers/staging/fsl-mc/include/mc.h @@ -160,13 +160,6 @@ struct fsl_mc_device { #define to_fsl_mc_device(_dev) \ container_of(_dev, struct fsl_mc_device, dev) -#ifdef CONFIG_FSL_MC_BUS -#define dev_is_fsl_mc(_dev) ((_dev)->bus == &fsl_mc_bus_type) -#else -/* If fsl-mc bus is not present device cannot belong to fsl-mc bus */ -#define dev_is_fsl_mc(_dev) (0) -#endif - /* * module_fsl_mc_driver() - Helper macro for drivers that don't do * anything special in module init/exit. This eliminates a lot of @@ -188,11 +181,6 @@ int __must_check __fsl_mc_driver_register(struct fsl_mc_driver *fsl_mc_driver, void fsl_mc_driver_unregister(struct fsl_mc_driver *driver); -bool fsl_mc_bus_exists(void); - -void fsl_mc_get_root_dprc(struct device *dev, - struct device **root_dprc_dev); - int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev, u16 mc_io_flags, struct fsl_mc_io **new_mc_io); @@ -211,8 +199,4 @@ int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev); void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev); -bool fsl_mc_is_root_dprc(struct device *dev); - -extern struct bus_type fsl_mc_bus_type; - #endif /* _FSL_MC_H_ */ -- 1.9.0