From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757934AbcHWWvL (ORCPT ); Tue, 23 Aug 2016 18:51:11 -0400 Received: from mail-cys01nam02on0073.outbound.protection.outlook.com ([104.47.37.73]:15978 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752228AbcHWWvJ (ORCPT ); Tue, 23 Aug 2016 18:51:09 -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 07/14] staging: fsl-mc: move bus private definitions into fsl-mc-bus.c Date: Tue, 23 Aug 2016 17:13:40 -0500 Message-ID: <1471990420-28603-1-git-send-email-stuart.yoder@nxp.com> X-Mailer: git-send-email 1.9.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131164642434809802;(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)(1109001)(1110001)(339900001)(189002)(199003)(50466002)(586003)(2906002)(8666005)(104016004)(92566002)(86362001)(19580405001)(19580395003)(47776003)(230783001)(626004)(8676002)(33646002)(356003)(50226002)(110136002)(7846002)(229853001)(8936002)(189998001)(106466001)(2351001)(85426001)(97736004)(4326007)(68736007)(77096005)(5660300001)(81156014)(48376002)(87936001)(105606002)(5003940100001)(305945005)(36756003)(50986999)(81166006)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR03MB443;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD017;1:bioipO/BxxnxWQ/A6o8YgOGU1NkNn1DIEChpC8evPA6fWl5FALmFGwGojNct+3GuuEsmFhMyG3Pm2WdEOeqaYp+dqnt+uzv0OqJ+VEVSOu9hcIJ80qpDk+NdZCTrulynvPGylazwj/XuV9hEa31TpfM0buL0MmPZ9UJ40fv1U/J/Bw48noc9yRQ6EqoCzJSjGvcpYCq+ZjLIO3Msec/Lyth96XWjqXNB3RUuqMOs8EzCiSPFbva2gFpvEQW8ow+kuqeDuLxkAYacRaC7sKas8WpphIOsxzZFly4e4QGG40uryLPfzhrXPO6ZYXdn8cuRCLhYvs0tXr/+8WesGwgnsqkd0M/g9/zJe/3/mFVe69/hjzCYwjEUsDZWv6r5yMN2UMZ+gvlaLt6s/tUbTphJOwS0kLJlWpNNZMDTLnXi5HAH8fdhRrkJ4zhjHlsgDpPvWJY78XFi/BO7I3VvmNDLXnr9IX57uL2lFfMUGAYn1QZTc9teN9iZg1/u9h6uQ0mmCum82dnM7V7svroROxKayQ5vUYwliUZEnkB2TC+edaP4PGApJ85TzFRymfblPFlbPuoBCwTieyGDv8ijvFakNrxi0gl44UoMby/AIfNlRJYELZbf+u5BwHCvIB59EF65/jPnAKb41l6mMGEzYVJZuKTBdD/T80FBLF92T5SifD9UIGRc0HcMgjBGJUVqphyxD4YMkqYjmXi0KR1pCxaWCJZNh6uUUkpMzDHhLEhN7K8= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 35c6823a-449e-4d28-9e6b-08d3cba341df X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB443;2:3+zD4cPWIs96U+mbc90gd2D86Gp3VZgKuK/o+anI4bJkxbaUlJE6X9tuwObvuEWvOjyxfTCBnLM5rrC8uI3haGW3ucCuqDzdX4WqJfeNSw+3hZBiosZ4+Mk9AdAWC0FOzjaCw5Cm03mV0tUf24a5hJ8A84HtKIQ2wtFgrXzoo4Aw/9feNa2n3J1OK4/CiZWP;3:sv8p6car7FGWiOSYWX0ITCUZ2oNk2aFfF518skfvMji3nJHkjVs3yBJ9VtAW7ggFcceQ4y/rnWf9/Vu6ykA+VT0EK0WDOY9qY7iYdRQuYrR//MrcbclyKH/Yu+jHcPoNC6fxBpU1qYfhVMZlrqCrXvfV5Mf2PNE0BPLyROhXDj/i0XfXJZDiN+bzJDIi9r4CZ9S7h3QJRPu8uVKmVvp+ydsToh+xK4MBgGsUL1Oieng= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB443; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB443;25:GFlxbeJoMy6HAmDX8DD01zXpvXP38Pz++LLnnxWrp+lzqlCatZ3z18D+G5mZX1jSrKFuIPGg9x1QFsOlhjoEw0oNRwu2qIzagz0v0f6h4VzsdFtMoeIIRrPvTLFI+u0vNa1HBHDEvWbFykJ5c3pmgordIdikfws+fowgk76n5sQBPueLkQ388a35gqF7afOG5jlsGJ6ZuRU0whoiLfzeegVhqm0MFivHPflurc2fc95klWJue+axG1qMwvoxQxLiudhavUfCkzYnJb13rV7MGrDEmReDE0nTmWGGJnRYsmkrmSBstyidB1Y/MkUYh5CRxK+o+etB7iyRVtfn/vYo3IyctnzWx4IZ/9YqRapp2vb0FvjyVJxMss+eDGQD2aVADETjSpM8c1ESJk494GvPTlx+FfL7xpealZ+nlM1fxEKM7PJhlTldcv1Qv4LIGu4iFIWbYlXXmxqg1e2htn8X/gz72RSFG9QZWvDVHrmumQqKwT04ZjQajGtfC2PFAzt1QPpAw35mSDDd8/0jgL/SqGkUO4+dJK4PpKLGkqdkbMYBTthGVuqns5YGYDiKYnjOkr0/yyM4/4HDFgaHjL331Df4ciKxNxGdfDD0Mzc4UjIazxRyKgZcznd10odHX6We1YlitBo7RAWd73hvyDP4/mDDCHxpHeGCj4sRVdp9GMU7bW4h6OCSSODbSm9TMqGIS7EdTohMprWclXy+gfU/VoZagYXHywyiWJAcI8jJaKo= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB443;31:NRdAAAvWoyYZcdmKRjZ5MKqrBzwHFbU9NFootcHgC6ojPyY4HSQ/e845ogBOWZFFqE5G7C03+rZmqzxw/Or4Jf8UoJ6yrZlrHFC6EMH3Umg5Z5dNbZzhcF3t5g+7J+9DN/zjcbLazFQEvpVzTzPEOYObJw2BAdWZpHSJOq9y8z/vQy3AekyJai+0EczSp8umHbnv19TXX5ZlwbeLEewdrZxWfDzQCE1yFJAnwAuew5I=;4:LcJt2UU7W7HxNTB5DLQgNbmGldZc1u30DJZR5XC1Xx3WAeS7FT/pTUL5SbiB4+RCB126GCIqOo4RG/8EKej4BVAsYp70DKE+JzvqFaKEM0V5fbg8zGreGYqJ4APjsREa7BjdSzv9wQ5AoF33dlnlZe6jXKMu/vzrMeYTKftf04soGIdl97XOs6HaIeY0HkfQDqJZjmjfHRpYlhXhbaYwmqi8FqoCekrwQa/OUKROhdhwoZTdzOZDiYUqHuMwCDBXyc4Xipgs6CgpcDH767MvXDcTgjJC/1z85znvt1lAspapB8VqICjtx04cZMPwuY9NQVO8/nwN1Gq0ToIXiiOFf0+x4JDmD6TE5m46Wa7xWlJdVX1oHzOSI8LpjXPkI/Z84teXDwH8SoO3RqI/6xh5BhWFGjMZB0xoEXa6XEZvI01tNtisCcKAFjzgOudkCQPiRfmWqFCbkC1aoWS0UVb/6c7q+F8gVG62eauTbiwpShhbo7yzf8a2mJ4gPDz2hhcuji1CovwOH77m9gARpgUeir1NqAjZkO9gipFMa85yzN8= 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:BY2PR03MB443;BCL:0;PCL:0;RULEID:(400006);SRVR:BY2PR03MB443; X-Forefront-PRVS: 004395A01C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR03MB443;23:db/fVhb3vWDAOmYRzDWr04IMCiB5XHKd7F6Di2F00n?= =?us-ascii?Q?XqqG+m7ovp+6vIs90XXb3LoeGDxHYE+io6zMUFB3+IId+PoxeT4rdGZXdkTv?= =?us-ascii?Q?7Vv+RkLFwulDKCOvpfQuSZP6ZbiLoDZqd0N0Y3LHyKC1gO8DBmvMTxd6M3W6?= =?us-ascii?Q?35VQggUgYKhV30PVbv7WgRKWVALf7z7l15HWBmj42wwhF1O/BjChgHzcQrTv?= =?us-ascii?Q?CECkg5T8u9iy5fcJFIxKAH7rjsMnW4D0OETwd/iTaU3PO9oHeQT/7qsdOSMX?= =?us-ascii?Q?8WkWwa4ppy5f49LcsgeOEi93esAwBfzYxuVbCKI1aH+bEzNJwneYOreCe58M?= =?us-ascii?Q?hrM3N+1Hae/99HhwA+zBxrAVXCfAxe3D6J5cYfNEUIKy6sF6eOFg7799WWZB?= =?us-ascii?Q?SMk4phkT5LfhLtoUnn3bJhMOclEcp4pOpH248HORaQsDF8V6rZFOL+WDocEO?= =?us-ascii?Q?tAq66J0qh5TyvNhMaGX91gziQhSRbTFJczjJUpwcIZodJ6XCz5cKrDehxNhE?= =?us-ascii?Q?pSdJWceIT9Iv3sxI/bMjtkdoUGxe0ahcqBDp94/I6/nNevoY80dASRoSzbRp?= =?us-ascii?Q?xpCo0psM+qwDZw4rbC4javGQfxUdhtmpJNJ432qK+jySgaN+YAClQhWcYQvT?= =?us-ascii?Q?EHyT8wn7znYq11Ort0yQwKPWagsbMlTWiSzY2rIfFsPFR/nctleeJnn4CLAa?= =?us-ascii?Q?PffxNrWLq2OmubA709wlsEmkIl4qQYVitqDmbFQ1xS0qDsCjUKVWGCdxpn0X?= =?us-ascii?Q?J3GP6/fmBJrky+6CuvLABvL5TmozKGFI6v36kHlLtChEODrVg6K6HBewttEo?= =?us-ascii?Q?C0qgk79lByC1D6Tf0voDMHWAPf2VMCaNwVAd2klIyX6D5fPIALkrCvzyD1wW?= =?us-ascii?Q?S/CTWSlBJtbVo/sCsrNhPTqp/CmrGWStV7rd2zkxuM+N2VSxzyt+3zpy828p?= =?us-ascii?Q?eqzL/MobRhy0N1Vz4rnZICQeFqIw80nowNmaVnRa2U6F633B3/NIHJABwAbj?= =?us-ascii?Q?0B1NadQBSV5B1yZFxliRNm7KPUZqMU47tcMJd+SnXlUVBC7Iut1z/xGM2DRq?= =?us-ascii?Q?Tzj4pVBunOJn7S948JHMX7B0ytB9jYjY1SEt0hHqf2Z8K8LnndOfx7EOzkpB?= =?us-ascii?Q?o1YhrYN9o=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB443;6:iP6SFQbPuMYwerxXxX7ODXGPWrjgXH0zSc+QZG2acIweU1/QUlGvnzJGDtpGWSyjqOR+l9GwtIb0OubHyR52au6zUiYLx+xPf+nMj7WVlqtEqPzq5aoJ/CjtRMcjGJUEcthZAIxPyLed2w4P5ckD8Kqpgul/YSWEU3UaQCeu3esXRahUA9wDEdsHL+cV3xP4tTsTJtZckO8vJBXNJw4Iml9n8W+kWPNT0luEIK0wIbIhprouctw1GsY5eFc6WTTb4wJCXTxUQywqCFRQpLqMMsZQwcQXtJumIWnrXVfbQCg=;5:iQGe5B0YinBKNObMjsEWmpf6JMDK8z+bunWPmDWg+rG96/B+GM2Q6L1Nw0zYBlifIa6ZQbKz58XrHNODgMpBGPyQV0UlcdFJd6pdzqHQkx0PdWusauhLOjZMgePG7Mw1HjXW0Tx+p8Rfgvtzvwcix3vlNseYfUPSP3EhnmlYXDU=;24:lP33+QCoiDvrYNdmmVeuJpCu5WldD6h65j5zYEc2XK3wDwBUpwqZIXzg3fY7NRsBiUnpwcj7/H4XTNUFJF47BfzrWL1RwXKNjfmtMlik51Q=;7:lsCCN6ivTIOxKxu7Gz9Ef/XhwADbJKH3AqsklE7MZVvIAKlDofopxzJH9GCmvC83VnR2F32TSHPdmOwwhSOgj3LumbA4bW0EHSeSQWNSqWXFfVImpRcJQ5waxEElzWb7EMVX6PmHohBYIxmPRz44Y/aaC79Iu1DFhY9GpiYZSZ7eRukxuKyIc+FDhCaYqBXqjQe1dB/PO/K5mXnUdkjN4v1F20501b1U5jbNHgPq+ikOyvsynAIMUnAVFGpNabzo SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2016 22:17:23.2781 (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: BY2PR03MB443 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move definitions that are private to fsl-mc-bus.c out of the public mc-bus.h and mc.h headers. Signed-off-by: Stuart Yoder --- drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 33 +++++++++++++++++++++++++++++++++ drivers/staging/fsl-mc/include/mc-bus.h | 28 ---------------------------- drivers/staging/fsl-mc/include/mc.h | 5 ----- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c index 180ff07..08363f8 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c @@ -26,6 +26,39 @@ static struct kmem_cache *mc_dev_cache; /** + * Default DMA mask for devices on a fsl-mc bus + */ +#define FSL_MC_DEFAULT_DMA_MASK (~0ULL) + +/** + * struct fsl_mc - Private data of a "fsl,qoriq-mc" platform device + * @root_mc_bus_dev: MC object device representing the root DPRC + * @num_translation_ranges: number of entries in addr_translation_ranges + * @translation_ranges: array of bus to system address translation ranges + */ +struct fsl_mc { + struct fsl_mc_device *root_mc_bus_dev; + u8 num_translation_ranges; + struct fsl_mc_addr_translation_range *translation_ranges; +}; + +/** + * struct fsl_mc_addr_translation_range - bus to system address translation + * range + * @mc_region_type: Type of MC region for the range being translated + * @start_mc_offset: Start MC offset of the range being translated + * @end_mc_offset: MC offset of the first byte after the range (last MC + * offset of the range is end_mc_offset - 1) + * @start_phys_addr: system physical address corresponding to start_mc_addr + */ +struct fsl_mc_addr_translation_range { + enum dprc_region_type mc_region_type; + u64 start_mc_offset; + u64 end_mc_offset; + phys_addr_t start_phys_addr; +}; + +/** * fsl_mc_bus_match - device to driver matching callback * @dev: the MC object device structure to match against * @drv: the device driver to search for matching MC object device id diff --git a/drivers/staging/fsl-mc/include/mc-bus.h b/drivers/staging/fsl-mc/include/mc-bus.h index 3f80506..9ea023b 100644 --- a/drivers/staging/fsl-mc/include/mc-bus.h +++ b/drivers/staging/fsl-mc/include/mc-bus.h @@ -29,34 +29,6 @@ struct irq_domain; struct msi_domain_info; /** - * struct fsl_mc - Private data of a "fsl,qoriq-mc" platform device - * @root_mc_bus_dev: MC object device representing the root DPRC - * @num_translation_ranges: number of entries in addr_translation_ranges - * @translation_ranges: array of bus to system address translation ranges - */ -struct fsl_mc { - struct fsl_mc_device *root_mc_bus_dev; - u8 num_translation_ranges; - struct fsl_mc_addr_translation_range *translation_ranges; -}; - -/** - * struct fsl_mc_addr_translation_range - bus to system address translation - * range - * @mc_region_type: Type of MC region for the range being translated - * @start_mc_offset: Start MC offset of the range being translated - * @end_mc_offset: MC offset of the first byte after the range (last MC - * offset of the range is end_mc_offset - 1) - * @start_phys_addr: system physical address corresponding to start_mc_addr - */ -struct fsl_mc_addr_translation_range { - enum dprc_region_type mc_region_type; - u64 start_mc_offset; - u64 end_mc_offset; - phys_addr_t start_phys_addr; -}; - -/** * struct fsl_mc_resource_pool - Pool of MC resources of a given * type * @type: type of resources in the pool diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h index 2d67535..ab439fa 100644 --- a/drivers/staging/fsl-mc/include/mc.h +++ b/drivers/staging/fsl-mc/include/mc.h @@ -112,11 +112,6 @@ struct fsl_mc_device_irq { #define FSL_MC_IS_DPRC 0x0001 /** - * Default DMA mask for devices on a fsl-mc bus - */ -#define FSL_MC_DEFAULT_DMA_MASK (~0ULL) - -/** * struct fsl_mc_device - MC object device object * @dev: Linux driver model device object * @dma_mask: Default DMA mask -- 1.9.0