Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934303AbcJZQ1M (ORCPT ); Wed, 26 Oct 2016 12:27:12 -0400 Received: from mail-sn1nam01on0078.outbound.protection.outlook.com ([104.47.32.78]:11808 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934041AbcJZQ1B (ORCPT ); Wed, 26 Oct 2016 12:27:01 -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 10/12] staging: fsl-mc: improve wording in comments Date: Wed, 26 Oct 2016 11:20:32 -0500 Message-ID: <1477498834-30425-11-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: 131219728137376215;(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)(2906002)(229853001)(19580405001)(50466002)(7846002)(106466001)(2351001)(69596002)(19580395003)(50986999)(47776003)(105606002)(4326007)(6666003)(77096005)(76176999)(86362001)(2950100002)(356003)(81166006)(87936001)(8676002)(85426001)(8666005)(81156014)(5003940100001)(586003)(189998001)(305945005)(6916009)(97736004)(33646002)(68736007)(5660300001)(36756003)(50226002)(8936002)(110136003)(48376002)(104016004)(7416002)(92566002)(626004)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR0301MB1625;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11OLC015;1:dmcdJAR71edgL+7v6jRd6oenZE6Fi4lbf2ku9uR6LpA93ZYX+0gGRSq3DHZ7LQ2L3QcK+YZ4jmwa6cX4jF9zWUcO9cA9STkYtpxzY7x6fFT08dVDitO6/vINzbs7EV/p4jiiobpubpgFBAAqUS80ZAuhRmv01AbpHsGY694kLe5cm2Rvl9Etl5MS2k3TZ9WHQZwXtw3695S5Mpi82gwrNnKvX96huX+icznVVspe/W+N9iQCIFDbXgWhxxpQEU1mT2EDIXsda4UOJdup52XhMD+7NrLtMV3oVl9aFBS8MWQcVtXhbHbhBSHmyjQ4YzAUZITZgWGYV8vJQzo16uyh8Idlp3xlpCzJI9y09+qrLT2MW43dfp16ApNfbHkuutQUY7KpYJeFLBQSdh+Zw+dQDMIbizOo42UiN296r8xlWk4mq/XATuwuUX5QSj5QuULNq8i1xl0gCBqSLjlcn66rJ5LjxyenUoFlkGH8vUvT4NPatURsH5u5OPIk2L3quudzuLdkegLFWhUkgSpa/p0ApVdeFys9fPgwCnMaowwYyDtDjrOXBQefIoxBXvl4My3CiI+DRpx4oPkZimR78tsUe1wmkGfUKC2PwYecGG+6rR4l2HzhyklCldYHDvhqGDPtnSCA9U9aX2zWC3BzJBEFy5TJXAh7f4fAsyzrrXPWMMofO/ax1k09y7uCnyJ1wj5Wo2KCW/mNukPehwyVS0U68n4jvhhARQv8njdxPBvcUBI= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 23cd0935-701b-46f6-a3eb-08d3fdbce583 X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1625;2:rDQASNF2wyP617ZyeCzuepXB+Oze5eouFXeCeqoBMvj2+BPE+gqsX42TagROR+oaFBJULdahob9AA43Qvfpyzx2512qD6pMGHUq8ngjknxQsifdf9yJEkLAAzBpckPN5ywuo6ZAozguOp0dcz7Exdg0cmH0oUVFHFddXIjD0XHZ9gl0/K7yZezvJ3Xy+eCViTWG1BffuH5BVRaFidNXL1A==;3:7ddiYqPG+Xc1x+LlCRxxsI9QW9OibeWwI5S6/Y8FkeUxPRSlr+NJOVFEx45nJ8mn3J6n2WA5Cm7ojoTvAA7gUfOlj/R0CB1+RPlsaCTthU5hedsMpu4xeu8g2UgB/y7dc+tU6Wr9Vnp3YnmKxzyY4u2xDEFi+wUaTojmIRzrDjsC3YX4/AJKEa76ki39xUPeCZPPYrFGQDvwJv4OPPqn8nKvJUDk3IDDdZRlNTJlZeTjBVFrO6w9wlRjCupIlCCe X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1625; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1625;25:+w2rgFhPXQa2Bs/ifMXDHZIL60B98RhNPgjFkwAiEw+hGyVT5X++koyUg2sOKwwJGhwQihCJGMOj4nl45YR954PJa6v8MYNOQj1M5r3DwdG0+h1T7xcIPTWQbpf3cv1UFjOJyOjRy79Jj06oH1vfwcD8y2E0KXovNv7mYTsMTCvJgbclYxDmYsO7ZjQb5Su/y/GYk0NWM10Vt1BUgk8KThZ1z6UPxGTjMgaVoJ/DJ+Zrk5g3zKaABjb2zfprt83EJLA0y8Y5h+k9amEWR/RCmNOytDo0wKUH4wt2VQ+J7VmdssVzbYQ9Zc/qsJz8sr6AWUEVlVB+SMVseTZrmO2RjnKlMsG4UDpmDSpNljgI/wOvcJxXXn7FRONqIGAWmjoywcpM823iJvUCoNanALi7BAiPFOYvQ9ozCEGtW/6AT3IrOyOKq4BNBeoAwX9st0BNnrD57q44S+wQ+G89vlFkyYPwJmcUtWSQA/tu4L0hg72a5jNdDqVd+vXcEYEuzHyJ5mmwAmncDaYNztCmp54by8ojhvdYPsc3Ka7DvacqNoCnJ48N7uicPoM8PkiC3UJayhbvx0ULhGB4cQJo5k7QkgWNyT/H/ah4vBgf1UFCZ0JCX3/gqpOyOV3fDf043lQHrw97f41yzMly957h07B3XrYMQHhUFnii6PCJRmbeyfb+WYN/GHmiguSPTKmGqUxpU9BaSrFfMDfs+ukvu5JgV26j/Sr/G8RObZnmSGilJbvgSnFMIIm9ig2Lwmu9cgdIZBkdrTBm8plWbNYWHz9Deg== X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1625;31:NlGmFUwUPegkhT0j+ou1mHckZ6hVJKNpXwtjZUMjzH6WDHWH+mTOoHuT01tNhph9CMV34kIs++EUwcDZUGcBsH3cGx8H/2HF7/gJ6w851tI+Ae8yXrd1CrhsPFvq7EywbbsHkzYv5HfcGzTeTEhArhyimIMsAiafgluFBfV+V0rwgbAFQvTUbef/eLynJHnKoqjpkN5N3aicKU7aewj/sg5ef9K40QRPfG4QSyYWF6C3gP5skqhsduSN2fCzwYJaAKl+iNUpZzteJnRGfUxKkonIOvVMBaB8kto7c7F+1Ys=;4:3wakb9QjeUO/AxRDn28r9V2fRIqXaoOLkI1nCYcECGMRe7xxJTntudmRWCBADCKBZyOxkPGYSbM1kOjeUmerdis5Dl8mKQ9X9AVWlCWJGBzo/EcadW+S/4pC+PVOUnJWBYEO4UqiAyfHM2dJJJ4tp1fPM151GL98BUqewUmzsiK0vcQjEu1QhzsLIHG+fcRL65/K7JC+nyioO1ERtMTXi3IZ6qksiUOx5s7/VgCJ9Ekx/lTTNItTwmL8pTvK3xOlS9Matd5KlQ64mhlG1kYAd337Bf0+yzxaX/huUUQM1v0wYMFNnSdmfKb16bZ/MZgbtSFg1kAAMxtJZs72lfdPQOj4l3L4XvnAP83WnoaNLs7Z2YLcJJfeR0pG2ScSY/mntjPzn3dEgbGOilUb3FcWUbytTII8pbKW0cZEzXYDQDzcWKv7vpD5k89A3pz2P0L+PMQA2E2ZPGLH53gv8NO7AGozsPuKEThNfOzSjJPtJs5SWaFzPKSLWlHRQXVji2tqaoAVgukhECDtw8RwojQ42H/3AqTi9ySSB2F+DkUvn777EyDpF4XlbERv5Vbqe0U+Xp3f+K/B4waaa+uWEX0VpA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(227817650892897); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(13024025)(13018025)(13015025)(13023025)(13017025)(8121501046)(5005006)(10201501046)(3002001)(6055026);SRVR:CY1PR0301MB1625;BCL:0;PCL:0;RULEID:(400006);SRVR:CY1PR0301MB1625; X-Forefront-PRVS: 0107098B6C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR0301MB1625;23:mV9GJ5MUaYzNyn9IlIDykPzYBK5rkx9Bz3uHnmq?= =?us-ascii?Q?FVOfAB2aGwD1n/ABh2eNExlUDl4pL5yzDndNBL+thgsiUyQeWJjKynSH8Dls?= =?us-ascii?Q?EiFdaO5klF3jxF/53LtaOzcZGgoQWNEQ2o+gKStCl42AxDB7h+rNfUg6QFpn?= =?us-ascii?Q?VoOBPybYtE+fTqWvmBeSr3/KS35tTcDVt+F5C00Eg4ke4wXb4yOBysiCcM52?= =?us-ascii?Q?xQQymtCu5BySVYfjIfNYwZPlB54QY9gtZPJy/mUJM8pfzdUoKQlvN9gM3AW1?= =?us-ascii?Q?yxhVcMRcNdWtW264V8ku+/dc+s3SQZzjToBHwj6l1dpXhkPfA0ciEv4nNKF7?= =?us-ascii?Q?cmyOJ0bIsmpN1Eu5ek+Q0regvLYCbxgXB3Ws2vpQgFdZM0IgKQWxlhLJRO19?= =?us-ascii?Q?QkDXbesvpXvraqXoOXPSTOlyQgZDLY80GBHr0cAFkUTEi/ey0QIZzeARYEUa?= =?us-ascii?Q?XWEaV6qT4ZdHyt5kKaYQfjpnVGT2OSNhw73ZID2RJV8NP2o8rjLg8k7WRFV3?= =?us-ascii?Q?WxDbLMLxD5kONF/eDzrOwhkSA8CQYyzPnIa6K/kml+mM9Klo+7kTtcUTVrT8?= =?us-ascii?Q?IlZqySZcc1QbuxGxRvLCEPXLdPZx2iqQcNTTwWRcYiiNY59pG+/LCWd6GWq7?= =?us-ascii?Q?obbJqY8UftXdYZMkxbkDnepIl+KwkgvwrPbPcfUhKpfgth4x3pJi90vHdxw+?= =?us-ascii?Q?pgrhkVIM79p+wqVjC9YVhOuCOh6bqRKkxpUE284j3D7Yyv6pN/44DxiM79l7?= =?us-ascii?Q?dvcJN9DrcTBDCP46XNwvC8rUJGvPCcAYokr63xkfrbC0wIhIZsKca/xu8rgE?= =?us-ascii?Q?0kVAl2kcZbYCl6prr9zPe3JpP5CoGkHz7hdcwipEpMlo46j1Hzey/JgGytRE?= =?us-ascii?Q?m35gf60gPiPAg/m85DSLrnideTP+tyhrYkbbPzauihXzajzkO9kWxBbVtyOM?= =?us-ascii?Q?dXmlDZYvTKN+vDt6IMiODTYPYiTxXGhRy2b6IeqdgJYL1ZJFAE7xllMpDPDx?= =?us-ascii?Q?feL2vRn3eEtIXxgFn6FZBLwty6NE5PlVyftR2g1K7g0WrCP/k8PvaSZTsA/g?= =?us-ascii?Q?3mTzJ1N0qziZ3Edt9oKGnu0fRt9URB354q90WaDRY8sMGaUr6DT09G9LNcT7?= =?us-ascii?Q?0JkRMwtsTeaqfQRFeyFsmOD8JUpoGaF8ENIcHoY5GM/Wjbmv5P7w+G3OtcI7?= =?us-ascii?Q?q8ReXzdfUrTR6TWYB26/Qr/cccmjlZ+juNeoN1v/nalJcy9JTUOO/F3GJyQ?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1625;6:9KrFH8jpaVOZqecHdP6yzRiXbRRtAYGOa1oiPyKRKA5wIG0FrvSwIgwb+vyFodgOUptSSDssIm8VolAHy+mrC8/VUzZO5Oa5hBUtraQMASifKyaBPyT3uxSghKExRmaQmV8i1lW2PaBGSp/ohxrgjnQ84PLEy/FcWs9z6fC0myGamu0rNQJ0/nPxg9WV/+gwiV/hXDIWlTTXHxcbVPgtNyRgBHulWBwC5yfOn6Pb0FbNguDqIi/qDzcNntr88NHQbP5NkQgYHo4V7UHIwQyc1dzHBv89ej429mpw4u+Xqr/KPAynV++H0bLg/UL7KmwO;5:lp1yHyu363sky/wqE5bw6jbJ0Q/QizvZMudaxNTBCmhj+HUkOHbfFKvjLEGVJ8oM0NXqOll9WwWQ5q2LgE18EQPXN31M6ec+YpNhQifgSR4y8W/nmjY2reRR9aEd3fvoZ7VvkEwFTQP62I/gveMnnAHwJBVwQCtTTNcG6Zuu3sC7eBOQzgz+RtQmlqOQshSx;24:IOTY0DP0WEjdLtr4QknwsG79C5UgIw0UEPAVW0RUhBK9yzNIy+CqMgrvspr/v8YFJ5pMg2ZWvFCU+NjewQK7h5im5bYEM0GIfwehJoqtW48= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1625;7:jSYaCWfypmaPlW/t8s1GzpOCmjW6vqyszE7OTcsqPIRHWk/aPrFy55wE58tZF39JOWeFydSqA6N+f8uKXjzfolndvDQ5c1bR5Y8vqkcwxNcDRvV16y0XNCDHKHH9Ymm0bumvGApfokZ1RcuWXPd1vnXH9NRk6Krb0zaOgiiTDqPDOcH4FU22Y0zU/k0l7lcUAGZhisVmW/jnI8NpDke9nIyULZwB1PFtPPdIyPb4wbMYqOPWjezpeUoijHdcatnmNAsFme18suaTWF1uCVXeGWTxCf7sarvOPOIcZpBljZToGQHZuhn8LvTDwiqMOOkQgReQlWDvjOKUvvDxdyb5GfbE0riLXqS6Ba46pE6v6OM= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2016 16:26:53.3476 (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: CY1PR0301MB1625 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 8623 Lines: 217 improve and clarify miscellaneous comments in the bus driver and allocator Signed-off-by: Stuart Yoder --- -v2 -update/improve commit message drivers/staging/fsl-mc/bus/fsl-mc-allocator.c | 68 +++++++++++++-------------- drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 18 +++---- 2 files changed, 42 insertions(+), 44 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c index e92c780..4a7ac97 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c @@ -1,5 +1,5 @@ /* - * Freescale MC object device allocator driver + * fsl-mc object allocator driver * * Copyright (C) 2013 Freescale Semiconductor, Inc. * @@ -23,15 +23,12 @@ strcmp(_obj_type, "dpcon") == 0) /** - * fsl_mc_resource_pool_add_device - add allocatable device to a resource - * pool of a given MC bus + * fsl_mc_resource_pool_add_device - add allocatable object to a resource + * pool of a given fsl-mc bus * - * @mc_bus: pointer to the MC bus - * @pool_type: MC bus pool type - * @mc_dev: Pointer to allocatable MC object device - * - * It adds an allocatable MC object device to a container's resource pool of - * the given resource type + * @mc_bus: pointer to the fsl-mc bus + * @pool_type: pool type + * @mc_dev: pointer to allocatable fsl-mc device */ static int __must_check fsl_mc_resource_pool_add_device(struct fsl_mc_bus *mc_bus, @@ -95,10 +92,10 @@ static int __must_check fsl_mc_resource_pool_add_device(struct fsl_mc_bus * fsl_mc_resource_pool_remove_device - remove an allocatable device from a * resource pool * - * @mc_dev: Pointer to allocatable MC object device + * @mc_dev: pointer to allocatable fsl-mc device * - * It permanently removes an allocatable MC object device from the resource - * pool, the device is currently in, as long as it is in the pool's free list. + * It permanently removes an allocatable fsl-mc device from the resource + * pool. It's an error if the device is in use. */ static int __must_check fsl_mc_resource_pool_remove_device(struct fsl_mc_device *mc_dev) @@ -255,17 +252,18 @@ void fsl_mc_resource_free(struct fsl_mc_resource *resource) EXPORT_SYMBOL_GPL(fsl_mc_resource_free); /** - * fsl_mc_object_allocate - Allocates a MC object device of the given - * pool type from a given MC bus + * fsl_mc_object_allocate - Allocates an fsl-mc object of the given + * pool type from a given fsl-mc bus instance * - * @mc_dev: MC device for which the MC object device is to be allocated - * @pool_type: MC bus resource pool type - * @new_mc_dev: Pointer to area where the pointer to the allocated - * MC object device is to be returned + * @mc_dev: fsl-mc device which is used in conjunction with the + * allocated object + * @pool_type: pool type + * @new_mc_dev: pointer to area where the pointer to the allocated device + * is to be returned * - * This function allocates a MC object device from the device's parent DPRC, - * from the corresponding MC bus' pool of allocatable MC object devices of - * the given resource type. mc_dev cannot be a DPRC itself. + * Allocatable objects are always used in conjunction with some functional + * device. This function allocates an object of the specified type from + * the DPRC containing the functional device. * * NOTE: pool_type must be different from FSL_MC_POOL_MCP, since MC * portals are allocated using fsl_mc_portal_allocate(), instead of @@ -312,10 +310,9 @@ int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev, EXPORT_SYMBOL_GPL(fsl_mc_object_allocate); /** - * fsl_mc_object_free - Returns an allocatable MC object device to the - * corresponding resource pool of a given MC bus. - * - * @mc_adev: Pointer to the MC object device + * fsl_mc_object_free - Returns an fsl-mc object to the resource + * pool where it came from. + * @mc_adev: Pointer to the fsl-mc device */ void fsl_mc_object_free(struct fsl_mc_device *mc_adev) { @@ -332,8 +329,14 @@ void fsl_mc_object_free(struct fsl_mc_device *mc_adev) EXPORT_SYMBOL_GPL(fsl_mc_object_free); /* - * Initialize the interrupt pool associated with a MC bus. - * It allocates a block of IRQs from the GIC-ITS + * A DPRC and the devices in the DPRC all share the same GIC-ITS device + * ID. A block of IRQs is pre-allocated and maintained in a pool + * from which devices can allocate them when needed. + */ + +/* + * Initialize the interrupt pool associated with an fsl-mc bus. + * It allocates a block of IRQs from the GIC-ITS. */ int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus, unsigned int irq_count) @@ -395,7 +398,7 @@ int fsl_mc_populate_irq_pool(struct fsl_mc_bus *mc_bus, EXPORT_SYMBOL_GPL(fsl_mc_populate_irq_pool); /** - * Teardown the interrupt pool associated with an MC bus. + * Teardown the interrupt pool associated with an fsl-mc bus. * It frees the IRQs that were allocated to the pool, back to the GIC-ITS. */ void fsl_mc_cleanup_irq_pool(struct fsl_mc_bus *mc_bus) @@ -422,11 +425,7 @@ void fsl_mc_cleanup_irq_pool(struct fsl_mc_bus *mc_bus) EXPORT_SYMBOL_GPL(fsl_mc_cleanup_irq_pool); /** - * It allocates the IRQs required by a given MC object device. The - * IRQs are allocated from the interrupt pool associated with the - * MC bus that contains the device, if the device is not a DPRC device. - * Otherwise, the IRQs are allocated from the interrupt pool associated - * with the MC bus that represents the DPRC device itself. + * Allocate the IRQs required by a given fsl-mc device. */ int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev) { @@ -495,8 +494,7 @@ int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev) EXPORT_SYMBOL_GPL(fsl_mc_allocate_irqs); /* - * It frees the IRQs that were allocated for a MC object device, by - * returning them to the corresponding interrupt pool. + * Frees the IRQs that were allocated for an fsl-mc device. */ void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev) { diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c index fb062d3..6f148b2 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c @@ -36,7 +36,7 @@ /** * struct fsl_mc - Private data of a "fsl,qoriq-mc" platform device - * @root_mc_bus_dev: MC object device representing the root DPRC + * @root_mc_bus_dev: fsl-mc 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 */ @@ -64,8 +64,8 @@ struct fsl_mc_addr_translation_range { /** * 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 + * @dev: the fsl-mc device to match against + * @drv: the device driver to search for matching fsl-mc object type * structures * * Returns 1 on success, 0 otherwise. @@ -93,7 +93,7 @@ static int fsl_mc_bus_match(struct device *dev, struct device_driver *drv) /* * Traverse the match_id table of the given driver, trying to find - * a matching for the given MC object device. + * a matching for the given device. */ for (id = mc_drv->match_id_table; id->vendor != 0x0; id++) { if (id->vendor == mc_dev->obj_desc.vendor && @@ -450,7 +450,7 @@ bool fsl_mc_is_root_dprc(struct device *dev) } /** - * Add a newly discovered MC object device to be visible in Linux + * Add a newly discovered fsl-mc device to be visible in Linux */ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, struct fsl_mc_io *mc_io, @@ -531,8 +531,8 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, goto error_cleanup_dev; } else { /* - * A non-DPRC MC object device has to be a child of another - * MC object (specifically a DPRC object) + * A non-DPRC object has to be a child of a DPRC, use the + * parent's ICID and interrupt domain. */ mc_dev->icid = parent_mc_dev->icid; mc_dev->dma_mask = FSL_MC_DEFAULT_DMA_MASK; @@ -587,10 +587,10 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, EXPORT_SYMBOL_GPL(fsl_mc_device_add); /** - * fsl_mc_device_remove - Remove a MC object device from being visible to + * fsl_mc_device_remove - Remove an fsl-mc device from being visible to * Linux * - * @mc_dev: Pointer to a MC object device object + * @mc_dev: Pointer to an fsl-mc device */ void fsl_mc_device_remove(struct fsl_mc_device *mc_dev) { -- 1.9.0