Commit ae74754d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "staging: fsl-mc: turn several exported functions static"

This reverts commit 10a8593a.

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 3943749b
...@@ -220,8 +220,8 @@ static void dprc_add_new_devices(struct fsl_mc_device *mc_bus_dev, ...@@ -220,8 +220,8 @@ static void dprc_add_new_devices(struct fsl_mc_device *mc_bus_dev,
* populated before they can get allocation requests from probe callbacks * populated before they can get allocation requests from probe callbacks
* of the device drivers for the non-allocatable devices. * of the device drivers for the non-allocatable devices.
*/ */
static int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev,
unsigned int *total_irq_count) unsigned int *total_irq_count)
{ {
int num_child_objects; int num_child_objects;
int dprc_get_obj_failures; int dprc_get_obj_failures;
...@@ -309,6 +309,7 @@ static int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, ...@@ -309,6 +309,7 @@ static int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(dprc_scan_objects);
/** /**
* dprc_scan_container - Scans a physical DPRC and synchronizes Linux bus state * dprc_scan_container - Scans a physical DPRC and synchronizes Linux bus state
...@@ -319,7 +320,7 @@ static int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, ...@@ -319,7 +320,7 @@ static int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev,
* bus driver with the actual state of the MC by adding and removing * bus driver with the actual state of the MC by adding and removing
* devices as appropriate. * devices as appropriate.
*/ */
static int dprc_scan_container(struct fsl_mc_device *mc_bus_dev) int dprc_scan_container(struct fsl_mc_device *mc_bus_dev)
{ {
int error; int error;
unsigned int irq_count; unsigned int irq_count;
...@@ -355,6 +356,7 @@ static int dprc_scan_container(struct fsl_mc_device *mc_bus_dev) ...@@ -355,6 +356,7 @@ static int dprc_scan_container(struct fsl_mc_device *mc_bus_dev)
fsl_mc_cleanup_all_resource_pools(mc_bus_dev); fsl_mc_cleanup_all_resource_pools(mc_bus_dev);
return error; return error;
} }
EXPORT_SYMBOL_GPL(dprc_scan_container);
/** /**
* dprc_irq0_handler - Regular ISR for DPRC interrupt 0 * dprc_irq0_handler - Regular ISR for DPRC interrupt 0
......
...@@ -241,8 +241,8 @@ EXPORT_SYMBOL_GPL(fsl_mc_driver_unregister); ...@@ -241,8 +241,8 @@ EXPORT_SYMBOL_GPL(fsl_mc_driver_unregister);
/** /**
* fsl_mc_get_root_dprc - function to traverse to the root dprc * fsl_mc_get_root_dprc - function to traverse to the root dprc
*/ */
static void fsl_mc_get_root_dprc(struct device *dev, void fsl_mc_get_root_dprc(struct device *dev,
struct device **root_dprc_dev) struct device **root_dprc_dev)
{ {
if (WARN_ON(!dev)) { if (WARN_ON(!dev)) {
*root_dprc_dev = NULL; *root_dprc_dev = NULL;
...@@ -254,6 +254,7 @@ static void fsl_mc_get_root_dprc(struct device *dev, ...@@ -254,6 +254,7 @@ static void fsl_mc_get_root_dprc(struct device *dev,
*root_dprc_dev = (*root_dprc_dev)->parent; *root_dprc_dev = (*root_dprc_dev)->parent;
} }
} }
EXPORT_SYMBOL_GPL(fsl_mc_get_root_dprc);
static int get_dprc_attr(struct fsl_mc_io *mc_io, static int get_dprc_attr(struct fsl_mc_io *mc_io,
int container_id, struct dprc_attributes *attr) int container_id, struct dprc_attributes *attr)
......
...@@ -70,6 +70,11 @@ struct fsl_mc_bus { ...@@ -70,6 +70,11 @@ struct fsl_mc_bus {
#define to_fsl_mc_bus(_mc_dev) \ #define to_fsl_mc_bus(_mc_dev) \
container_of(_mc_dev, struct fsl_mc_bus, mc_dev) container_of(_mc_dev, struct fsl_mc_bus, mc_dev)
int dprc_scan_container(struct fsl_mc_device *mc_bus_dev);
int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev,
unsigned int *total_irq_count);
struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode, struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode,
struct msi_domain_info *info, struct msi_domain_info *info,
struct irq_domain *parent); struct irq_domain *parent);
...@@ -86,6 +91,9 @@ void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev); ...@@ -86,6 +91,9 @@ 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); void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev);
void fsl_mc_get_root_dprc(struct device *dev,
struct device **root_dprc_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; extern struct bus_type fsl_mc_bus_type;
......
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