[PATCH v3 1/8] staging: fsl-mc: static inline function to differentiate root dprc

From: Lijun Pan
Date: Mon Feb 08 2016 - 19:15:46 EST


Define a static inline function is_root_dprc(dev) to tell whether
a device is root dprc or not via platform_bus_type.
Remove fsl_mc_is_root_dprc() because is_root_dprc() is simpler
and easier to understand.

Signed-off-by: Lijun Pan <Lijun.Pan@xxxxxxxxxxxxx>
---
v3: rebased on top of greg's staging-testing
v2: use static inline function instead of macro
replace the fsl_mc_is_root_dprc with is_root_dprc

drivers/staging/fsl-mc/bus/mc-bus.c | 22 +++-------------------
drivers/staging/fsl-mc/include/mc.h | 14 ++++++++++++++
2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/drivers/staging/fsl-mc/bus/mc-bus.c b/drivers/staging/fsl-mc/bus/mc-bus.c
index 9317561..b828985 100644
--- a/drivers/staging/fsl-mc/bus/mc-bus.c
+++ b/drivers/staging/fsl-mc/bus/mc-bus.c
@@ -24,8 +24,6 @@

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
@@ -54,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 &&
- !fsl_mc_is_root_dprc(&mc_dev->dev))
+ !is_root_dprc(&mc_dev->dev))
goto out;

/*
@@ -238,20 +236,6 @@ static void fsl_mc_get_root_dprc(struct device *dev,
}
}

-/**
- * 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)
-{
- struct device *root_dprc_dev;
-
- fsl_mc_get_root_dprc(dev, &root_dprc_dev);
- if (!root_dprc_dev)
- return false;
- else
- return dev == root_dprc_dev;
-}
-
static int get_dprc_icid(struct fsl_mc_io *mc_io,
int container_id, u16 *icid)
{
@@ -545,7 +529,7 @@ void fsl_mc_device_remove(struct fsl_mc_device *mc_dev)
mc_dev->mc_io = NULL;
}

- if (fsl_mc_is_root_dprc(&mc_dev->dev)) {
+ if (is_root_dprc(&mc_dev->dev)) {
if (atomic_read(&root_dprc_count) > 0)
atomic_dec(&root_dprc_count);
else
@@ -777,7 +761,7 @@ static int fsl_mc_bus_remove(struct platform_device *pdev)
{
struct fsl_mc *mc = platform_get_drvdata(pdev);

- if (WARN_ON(!fsl_mc_is_root_dprc(&mc->root_mc_bus_dev->dev)))
+ if (WARN_ON(!is_root_dprc(&mc->root_mc_bus_dev->dev)))
return -EINVAL;

fsl_mc_device_remove(mc->root_mc_bus_dev);
diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h
index ac7c1ce..6dffa29 100644
--- a/drivers/staging/fsl-mc/include/mc.h
+++ b/drivers/staging/fsl-mc/include/mc.h
@@ -15,6 +15,7 @@
#include <linux/mod_devicetable.h>
#include <linux/list.h>
#include <linux/interrupt.h>
+#include <linux/platform_device.h>
#include "../include/dprc.h"

#define FSL_MC_VENDOR_FREESCALE 0x1957
@@ -226,4 +227,17 @@ void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev);

extern struct bus_type fsl_mc_bus_type;

+/**
+ * is_root_dprc - tell whether dev is root dprc or not.
+ * root dprc's parent is a platform device,
+ * that platform device's bus type is platform_bus_type.
+ * @dev: MC object device
+ * return 1 on root dprc, 0 otherwise
+ */
+static inline bool is_root_dprc(struct device *dev)
+{
+ return ((to_fsl_mc_device(dev)->flags & FSL_MC_IS_DPRC) &&
+ ((dev)->bus == &fsl_mc_bus_type) &&
+ ((dev)->parent->bus == &platform_bus_type));
+}
#endif /* _FSL_MC_H_ */
--
1.7.9.5