Commit e744e45a authored by Stuart Yoder's avatar Stuart Yoder Committed by Greg Kroah-Hartman
Browse files

staging: fsl-mc: move bus definitions from mc.h to mc-bus.h 



move public bus-related definitions to the proper mc-bus.h header.

Signed-off-by: default avatarStuart Yoder <stuart.yoder@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c7743b42

drivers/staging/fsl-mc/include/mc-bus.h

+16 −0
Original line number Diff line number Diff line
@@ -24,6 +24,13 @@ struct msi_domain_info; 
 */

#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
@@ -93,4 +100,13 @@ void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev); 


void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev);



bool fsl_mc_bus_exists(void);



void fsl_mc_get_root_dprc(struct device *dev,

			  struct device **root_dprc_dev);



bool fsl_mc_is_root_dprc(struct device *dev);



extern struct bus_type fsl_mc_bus_type;



#endif /* _FSL_MC_MCBUS_H_ */

drivers/staging/fsl-mc/include/mc.h

+0 −16
Original line number Diff line number Diff line
@@ -160,13 +160,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
@@ -188,11 +181,6 @@ int __must_check __fsl_mc_driver_register(struct fsl_mc_driver *fsl_mc_driver, 


void fsl_mc_driver_unregister(struct fsl_mc_driver *driver);



bool fsl_mc_bus_exists(void);



void fsl_mc_get_root_dprc(struct device *dev,

			  struct device **root_dprc_dev);



int __must_check fsl_mc_portal_allocate(struct fsl_mc_device *mc_dev,

					u16 mc_io_flags,

					struct fsl_mc_io **new_mc_io);
@@ -211,8 +199,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);



bool fsl_mc_is_root_dprc(struct device *dev);



extern struct bus_type fsl_mc_bus_type;



#endif /* _FSL_MC_H_ */