Commit 2f81d686 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "staging: fsl-mc: move couple of definitions to public header"

This reverts commit 7eba570e.

The whole series is broken, so back it all out.
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Cc: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8a325e9f
...@@ -20,6 +20,13 @@ ...@@ -20,6 +20,13 @@
*/ */
#define FSL_MC_IRQ_POOL_MAX_TOTAL_IRQS 256 #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 * struct fsl_mc_resource_pool - Pool of MC resources of a given
* type * type
...@@ -74,4 +81,6 @@ void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev); ...@@ -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); bool fsl_mc_is_root_dprc(struct device *dev);
extern struct bus_type fsl_mc_bus_type;
#endif /* _FSL_MC_MCBUS_H_ */ #endif /* _FSL_MC_MCBUS_H_ */
...@@ -201,13 +201,6 @@ struct fsl_mc_device { ...@@ -201,13 +201,6 @@ struct fsl_mc_device {
#define to_fsl_mc_device(_dev) \ #define to_fsl_mc_device(_dev) \
container_of(_dev, struct 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 * module_fsl_mc_driver() - Helper macro for drivers that don't do
* anything special in module init/exit. This eliminates a lot of * 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); ...@@ -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); void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev);
extern struct bus_type fsl_mc_bus_type;
#endif /* _FSL_MC_H_ */ #endif /* _FSL_MC_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment