From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751977AbcF1H3c (ORCPT ); Tue, 28 Jun 2016 03:29:32 -0400 Received: from mail-by2on0065.outbound.protection.outlook.com ([207.46.100.65]:36088 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750753AbcF1H3a (ORCPT ); Tue, 28 Jun 2016 03:29:30 -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: Nipun Gupta To: , CC: , , Nipun Gupta , Bharat Bhushan Subject: [PATCH] fsl-mc: add helper macro to determine if a device is of fsl_mc type Date: Tue, 28 Jun 2016 18:54:20 +0530 Message-ID: <1467120260-19332-1-git-send-email-nipun.gupta@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131115725677726448;(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)(199003)(189002)(68736007)(11100500001)(575784001)(92566002)(356003)(47776003)(86362001)(4326007)(33646002)(305945005)(97736004)(229853001)(36756003)(50226002)(586003)(19580405001)(85426001)(189998001)(7846002)(104016004)(6806005)(2906002)(19580395003)(69596002)(77096005)(48376002)(5001770100001)(81156014)(5003940100001)(50986999)(8666005)(81166006)(8936002)(87936001)(8676002)(106466001)(50466002)(105606002)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:SN2PR03MB1934;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11OLC004;1:SDlw2I/0c+kS1J6NuybQr7vK01+wMt3GGyllIH4BoFzdd8AjhBFkq8tSWNbQdJTLEebxgdY3bcMSl4lYuWeB52L6S7kSN1cnbpSAZkCsa30t1VqK75/jECvJzGFlznN5t6k57cGLEGECmeMXt5Mf/4bs97+/GtHeeglqtB2NjYJQH70/PeWObjAYBRCF+iydgZkiq4IePkQLAVXTcvOh4JbY8iN1FkQE+x/wXCmgvJMacdnazwdtxRvnoL7eT9bD6jxm2N831agTtPZAaVNvAvGhLdcH6PZWAgfe5zd+shRUKjEduZJjSR/mO/WslgL53h5yJ1xcIEF3Ej82b3VHP12WEke4RmIQzTjP17kUFsOhdXqrHwC4aZdc4kpoPBEyUKlzhVWo4YZm92ZtfuiQTjUqMUsifupXUAv8s0JoD6Tkj98AD6qfegS2tSJsVhkFtZrA1VU+xVMXBKTGz2S8Fa8yupD9rM85SE39OGRUYUcvwPoGtdo0TaZ7OXOKnVCJj+JDpNFu0gEecDXySL6uLQ+gKt1Qyz85CJZczxkGCVeoP0cLkfo6pjBBVjDdqQjqrSknRbEY30RF4k5tXuwKh7A9qUAQzkujMfDlCW9R7N2TZuUJ4Jjy9pTQta4RKNTTRSy6gTs/LRTU4ldwYnAkDt+zooy+JV6rBUDzOvrjUgd8xjmDIlSjawY5KGzazQUX1NpuZ9Hue5oAFe0tb4YfaGv3ZbFX+0bMkqplqxbA7Qg= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 89ae8e49-3b4b-4c0e-3d44-08d39f25efdc X-Microsoft-Exchange-Diagnostics: 1;SN2PR03MB1934;2:jPF07FZliXdRNXgTC0Jw+yuj/uA/X8wKB7jGe6pcGbBBCdmtDQw64kER8H6o6YWVkuwDytLY5b7uhi4P3ssx85wTRXdKBE3woDXxVRwApdgzbS0dTQ/XmEVS/ubiG3rYJWMPmJc5Kl8FgxIc07nZi66NqAeBfeamh6m9kfFfKTvZjKNnJJpAkZVui1kQMOG8;3:HX09uQxHU49X+s5fUnUChJ/my09+Prc1gLfCLUKJCkl6CQf3VW7BzXFj3h/GzVUFUBBBAwoA/o5V3Rg+Yfw/pPztXN1GNs3yK84TQNxX7CFb8FBPRfoHceVpzaD9hTmT7aZ9VjaNIaxmJmxfm7vT8SCWf9TXTOGFhvy2BN5EA8kkYXzqar94M271ALXCRhAni5gBAX1bfoDtbE80CZf8ID+xbTh96JkIkAMvG50sgVU=;25:acDuHI3eOvJh9YLMPRHj6NFJvFeD+WlqKeTTlSDbdZO7CGRjlPs/9RyVGLRkrMzDLBSmnH7H4rSiwK449bBiAp++4vR93ZUkC6hCJBwdaM0GemiVukNTRDiCPNOyVo2LtsNoMw1z+OFSSaiciPgQzcVLgw3m4VFVREEr5hZsB39/uvSkjZ+yCM5p5vOalwg3dS3M8dEuaUtu4MURPicHWo81Bl9opSBO4KYt20o8BVmF4/nku10PYSyAlPBa5/Rn X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN2PR03MB1934; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13024025)(13018025)(8121501046)(13015025)(13017025)(13023025)(5005006)(10201501046)(3002001)(6055026);SRVR:SN2PR03MB1934;BCL:0;PCL:0;RULEID:(400006);SRVR:SN2PR03MB1934; X-Microsoft-Exchange-Diagnostics: 1;SN2PR03MB1934;4:Q00ACZGe1j0oXDo/QU5kJvu87VefcDHVDK8s6s8+Scnfxzq9j36WWAfsmzmY0tHdftkPG7ZtZEJyowbJuw7lYRWLcEgIvn/RGO6Eq55edVEnY5DoCgyCDf17lDYfLrhxtziaDK9z/Lhmc8LN1II+1XM6ur8E9M1tYS2cin4kQlVDYQBlTctLaJlEM4yyeKUf3AMasHI9DzMG/sP5+S12CfZjrwqiuBJ+mLq/2BloFUmboZMkkmzXU3FBHlHFaPLBRHr8+tCK8GXGSeSgE6r9FIV3RUiiPEssYVkaKej9pypIwCbC7CGadROdG0UL+TfElSxpQqAsGaXo63uq8/WLzEJkMVrkeboBya899wyUxy2vBUn9F1M+KM1QzxBi7G6ObVvOBrfdL1lgr7uDYf9RGDMK8603dJiPFXD59D5eO4FwuJX0Zv1GGq7TsW6hKeSXgyLdXUvv5MHsr89ZQvnABXXFdx35DQS4k4P9tSTvA3inv8vVEc/aL7njbRS7FrC99zXEosDgP8NJb+70J0jlnQ== X-Forefront-PRVS: 0987ACA2E2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN2PR03MB1934;23:CmKL3IRNmrGA2xuQZBCQYL63BJMrnE6GM8GV9/IK1?= =?us-ascii?Q?DXAidDaEJ05vh/7jVi8quRIQdmDxPCmu1xCYbrvFMB0AAEHUEsmLnV9+sPCI?= =?us-ascii?Q?P1xHsdjmcH9tzin7fHb+9GMcz98OEN2urq18cnvMejl/XsnMTYwsedM4vSDb?= =?us-ascii?Q?xrg8XP2+QgRoqmrkUxhJsVK7XaI7OYo3L8t3D5Et0wjpI4m/FmWkMtlJDaAy?= =?us-ascii?Q?Upf2jcUt9hzcstLgUqtzEo4dkPc+qsi6WVRvtT+8MilmzGMAAtdhZ+weIlmG?= =?us-ascii?Q?0YEkCbH4xuT7vcklZw6Yl2/R4X8hUo9NRlLnVncSaqgtYH1NncHN1XT61/Ds?= =?us-ascii?Q?1B9Y2CaBzpC8gxqtuJfJ9SA5DhbVQXQA2Dp67YVFT4L89HR4Xs3vW+IcC15A?= =?us-ascii?Q?n6yH4gb5WdOHudZTQI6561bSTQwpoGYUBuh3kW6udvjhShYW6x7jLCEUqiIG?= =?us-ascii?Q?IF2M+F9gItTlLRLVbw+t26vfraXJsPlvep/dl1MXvEI6at7DGBJMAAkJ+2AF?= =?us-ascii?Q?mbFinXI9xLCEE1pq5VvwvF3VPjXLxRMVQ0GEbLWS5DfWxQjN1BR8gQBmomhf?= =?us-ascii?Q?fw70jCYzzEFeh7jGtAtyoMxVIgFyksrarZmUDtbNKqGQ51WSNgTW0KAAZ4FG?= =?us-ascii?Q?2ye/+/Dux4DjhWvVjNF5uWKJTG8EgU0V8ZosVx8T3hsnMXzxewYzr8l9mlzN?= =?us-ascii?Q?wWt4AUm23B/50I4lzKB9/ULaa48zhiDseunQkGatEbSIubYGccO3LqdiICgb?= =?us-ascii?Q?g64hSZB22LU5egQ+NG/vjl3x2HzgapzU2WmCNStP3BDO/KmC1EnaDz9aNTdt?= =?us-ascii?Q?zRz6xOotb2G+mE/KrpMCJdliq3Kc+Ob7goRzvUXbnApZKdJ9rrYl5F5E5pP8?= =?us-ascii?Q?xJ+fFzSGIpaMAHztqfdkxIy00RJHIJfuYIz2TnbzVApx150QM3Ope3uN7zaF?= =?us-ascii?Q?sdaKioP9E7QFkUKOijPwnwlifc6a4wY6fx6LhgEiqdzd3gqzhtk4zrepaiQw?= =?us-ascii?Q?kvGSk2XQrHD2O9I7SU7DPm2b33VZS5a5ILMu0xGCw6vzqsLFIU4XDq8ycsml?= =?us-ascii?Q?6cQe0a/Xh0N7keNV2rZjm98R3RF92jN/fut/oibsS04qdD2AYEEJOMm3pVQe?= =?us-ascii?Q?J/w80dzpCiB6GnESlIb/5MjyZ52x+EH6RN07PESvgrm3w57kDq5ZUE+VFAEK?= =?us-ascii?Q?GH/+Hmo7DjiZME=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN2PR03MB1934;5:mNpJZbYQywIM/CSLfDpeh5aE5BXh80f5x+G3YHhHeW8o3tlqwiu6MU+nwcrbjzgTJMRKnnxjwH+wTVY0dDni6RMqm/d28PCBLTNUu4EogniRegOX6FRbHQbm90qf8TRIY4W7Xzu1dzWxjXJmdZmyyBNS8jVUwNKbpU8KEWCRt00=;24:i+DlcyfZJ7T2aAb9uYzICYMBCvr/JrdcUPoLnfxbdl7fxxWSWvtXtjXwBdeovCGY4FUWbJlLWf/Ls6AyP+kWIVKskXjKYasgTLz1PboUR14= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2016 07:29:27.5074 (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: SN2PR03MB1934 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a helper macro to return if a device has a bus type of fsl_mc. This makes the bus driver code more readable and provides a way for drivers like the SMMU driver to easily check the bus type. Signed-off-by: Nipun Gupta Signed-off-by: Bharat Bhushan --- drivers/staging/fsl-mc/bus/dprc-driver.c | 4 ++-- drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 2 +- drivers/staging/fsl-mc/bus/mc-allocator.c | 6 +++--- drivers/staging/fsl-mc/bus/mc-bus.c | 6 +++--- drivers/staging/fsl-mc/include/mc.h | 2 ++ 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c index 7fc4717..cd6d75a 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c @@ -649,7 +649,7 @@ static int dprc_probe(struct fsl_mc_device *mc_dev) /* * This is a child DPRC: */ - if (WARN_ON(parent_dev->bus != &fsl_mc_bus_type)) + if (WARN_ON(!dev_is_fsl_mc(parent_dev))) return -EINVAL; if (WARN_ON(mc_dev->obj_desc.region_count == 0)) @@ -681,7 +681,7 @@ static int dprc_probe(struct fsl_mc_device *mc_dev) */ struct irq_domain *mc_msi_domain; - if (WARN_ON(parent_dev->bus == &fsl_mc_bus_type)) + if (WARN_ON(dev_is_fsl_mc(parent_dev))) return -EINVAL; error = fsl_mc_find_msi_domain(parent_dev, 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 720e2b0..d0c20d6 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 @@ -35,7 +35,7 @@ static int its_fsl_mc_msi_prepare(struct irq_domain *msi_domain, struct fsl_mc_device *mc_bus_dev; struct msi_domain_info *msi_info; - if (WARN_ON(dev->bus != &fsl_mc_bus_type)) + if (WARN_ON(!dev_is_fsl_mc(dev))) return -EINVAL; mc_bus_dev = to_fsl_mc_device(dev); diff --git a/drivers/staging/fsl-mc/bus/mc-allocator.c b/drivers/staging/fsl-mc/bus/mc-allocator.c index fb08f22..9216c32 100644 --- a/drivers/staging/fsl-mc/bus/mc-allocator.c +++ b/drivers/staging/fsl-mc/bus/mc-allocator.c @@ -281,7 +281,7 @@ int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev, if (mc_dev->flags & FSL_MC_IS_DPRC) { mc_bus_dev = mc_dev; } else { - if (WARN_ON(mc_dev->dev.parent->bus != &fsl_mc_bus_type)) + if (WARN_ON(!dev_is_fsl_mc(mc_dev->dev.parent))) return error; mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent); @@ -420,7 +420,7 @@ int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev, if (WARN_ON(mc_dev->flags & FSL_MC_IS_DPRC)) goto error; - if (WARN_ON(mc_dev->dev.parent->bus != &fsl_mc_bus_type)) + if (WARN_ON(!dev_is_fsl_mc(mc_dev->dev.parent))) goto error; if (WARN_ON(pool_type == FSL_MC_POOL_DPMCP)) @@ -678,7 +678,7 @@ static int fsl_mc_allocator_probe(struct fsl_mc_device *mc_dev) return -EINVAL; mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent); - if (WARN_ON(mc_bus_dev->dev.bus != &fsl_mc_bus_type)) + if (WARN_ON(!dev_is_fsl_mc(&mc_bus_dev->dev))) return -EINVAL; mc_bus = to_fsl_mc_bus(mc_bus_dev); diff --git a/drivers/staging/fsl-mc/bus/mc-bus.c b/drivers/staging/fsl-mc/bus/mc-bus.c index 4053643..098f07c 100644 --- a/drivers/staging/fsl-mc/bus/mc-bus.c +++ b/drivers/staging/fsl-mc/bus/mc-bus.c @@ -207,11 +207,11 @@ static void fsl_mc_get_root_dprc(struct device *dev, { if (WARN_ON(!dev)) { *root_dprc_dev = NULL; - } else if (WARN_ON(dev->bus != &fsl_mc_bus_type)) { + } else if (WARN_ON(!dev_is_fsl_mc(dev))) { *root_dprc_dev = NULL; } else { *root_dprc_dev = dev; - while ((*root_dprc_dev)->parent->bus == &fsl_mc_bus_type) + while (dev_is_fsl_mc((*root_dprc_dev)->parent)) *root_dprc_dev = (*root_dprc_dev)->parent; } } @@ -405,7 +405,7 @@ int fsl_mc_device_add(struct dprc_obj_desc *obj_desc, struct fsl_mc_bus *mc_bus = NULL; struct fsl_mc_device *parent_mc_dev; - if (parent_dev->bus == &fsl_mc_bus_type) + if (dev_is_fsl_mc(parent_dev)) parent_mc_dev = to_fsl_mc_device(parent_dev); else parent_mc_dev = NULL; diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h index ac7c1ce..3781035 100644 --- a/drivers/staging/fsl-mc/include/mc.h +++ b/drivers/staging/fsl-mc/include/mc.h @@ -183,6 +183,8 @@ struct fsl_mc_device { #define to_fsl_mc_device(_dev) \ container_of(_dev, struct fsl_mc_device, dev) +#define dev_is_fsl_mc(d) ((d)->bus == &fsl_mc_bus_type) + /* * module_fsl_mc_driver() - Helper macro for drivers that don't do * anything special in module init/exit. This eliminates a lot of -- 1.9.1