diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-26 13:50:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-26 13:50:54 +0200 |
| commit | 2f81d686ad91d6ad4a2818a657500c80962cf25f (patch) | |
| tree | 5fff29a633a8edc1550b4d103aa1a3b4dc9fe046 /drivers | |
| parent | 8a325e9f77fe3c1de760328c5e52ea48d617725f (diff) | |
Revert "staging: fsl-mc: move couple of definitions to public header"
This reverts commit 7eba570ece326ea0da2da72f1d4142100c145827.
The whole series is broken, so back it all out.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/fsl-mc/include/mc-bus.h | 9 | ||||
| -rw-r--r-- | drivers/staging/fsl-mc/include/mc.h | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/fsl-mc/include/mc-bus.h b/drivers/staging/fsl-mc/include/mc-bus.h index a79a679578d2..0860681bddc6 100644 --- a/drivers/staging/fsl-mc/include/mc-bus.h +++ b/drivers/staging/fsl-mc/include/mc-bus.h @@ -20,6 +20,13 @@ */ #define FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS 256 +#ifdef CONFIG_FSL_MC_BUS +#define dev_is_fsl_mc(_dev) ((_dev)->bus == &fsl_mc_bus_type) +#else +/* If fsl-mc bus is not present device cannot belong to fsl-mc bus */ +#define dev_is_fsl_mc(_dev) (0) +#endif + /** * struct fsl_mc_resource_pool - Pool of MC resources of a given * type @@ -74,4 +81,6 @@ void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev); bool fsl_mc_is_root_dprc(struct device *dev); +extern struct bus_type fsl_mc_bus_type; + #endif /* _FSL_MC_MCBUS_H_ */ diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h index d37e2c7ed55a..adb237845b40 100644 --- a/drivers/staging/fsl-mc/include/mc.h +++ b/drivers/staging/fsl-mc/include/mc.h @@ -201,13 +201,6 @@ struct fsl_mc_device { #define to_fsl_mc_device(_dev) \ container_of(_dev, struct fsl_mc_device, dev) -#ifdef CONFIG_FSL_MC_BUS -#define dev_is_fsl_mc(_dev) ((_dev)->bus == &fsl_mc_bus_type) -#else -/* If fsl-mc bus is not present device cannot belong to fsl-mc bus */ -#define dev_is_fsl_mc(_dev) (0) -#endif - /* * module_fsl_mc_driver() - Helper macro for drivers that don't do * anything special in module init/exit. This eliminates a lot of @@ -251,6 +244,4 @@ int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev); void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev); -extern struct bus_type fsl_mc_bus_type; - #endif /* _FSL_MC_H_ */ |