OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: fsl-mc: abstract test for whether a dprc is a root dprc 

Instead of relying on assumptions about fields in data
structures, abstract the test for whether a dprc is a root
dprc into a function.

Signed-off-by: Itai Katz <itai.katz@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Itai Katz 2015-10-04 10:09:51 +03:00 committed by Greg Kroah-Hartman
parent 14f928054a
commit b55f00c6ed
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/fsl-mc/bus/mc-bus.c
View File

@ -22,6 +22,8 @@
static struct kmem_cache *mc_dev_cache;
static bool fsl_mc_is_root_dprc(struct device *dev);
/**
* fsl_mc_bus_match - device to driver matching callback
* @dev: the MC object device structure to match against
@ -50,7 +52,7 @@ static int fsl_mc_bus_match(struct device *dev, struct device_driver *drv)
* Only exception is the root DPRC, which is a special case.
*/
if ((mc_dev->obj_desc.state & DPRC_OBJ_STATE_PLUGGED) == 0 &&
&mc_dev->dev != fsl_mc_bus_type.dev_root)
!fsl_mc_is_root_dprc(&mc_dev->dev))
goto out;
/*
@ -215,6 +217,14 @@ bool fsl_mc_bus_exists(void)
}
EXPORT_SYMBOL_GPL(fsl_mc_bus_exists);
/**
* fsl_mc_is_root_dprc - function to check if a given device is a root dprc
*/
static bool fsl_mc_is_root_dprc(struct device *dev)
{
return dev == fsl_mc_bus_type.dev_root;
}
static int get_dprc_icid(struct fsl_mc_io *mc_io,
int container_id, u16 *icid)
{
@ -500,7 +510,7 @@ void fsl_mc_device_remove(struct fsl_mc_device *mc_dev)
mc_dev->mc_io = NULL;
}
if (&mc_dev->dev == fsl_mc_bus_type.dev_root)
if (fsl_mc_is_root_dprc(&mc_dev->dev))
fsl_mc_bus_type.dev_root = NULL;
}
@ -726,7 +736,7 @@ static int fsl_mc_bus_remove(struct platform_device *pdev)
{
struct fsl_mc *mc = platform_get_drvdata(pdev);
if (WARN_ON(&mc->root_mc_bus_dev->dev != fsl_mc_bus_type.dev_root))
if (WARN_ON(!fsl_mc_is_root_dprc(&mc->root_mc_bus_dev->dev)))
return -EINVAL;
fsl_mc_device_remove(mc->root_mc_bus_dev);