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

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

drivers/staging/fsl-mc/bus/dprc-driver.c

+5 −3
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static void dprc_add_new_devices(struct fsl_mc_device *mc_bus_dev, 
 * populated before they can get allocation requests from probe callbacks

 * 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)

{

	int num_child_objects;
@@ -309,6 +309,7 @@ static int dprc_scan_objects(struct fsl_mc_device *mc_bus_dev, 


	return 0;

}

EXPORT_SYMBOL_GPL(dprc_scan_objects);



/**

 * 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, 
 * bus driver with the actual state of the MC by adding and removing

 * 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;

	unsigned int irq_count;
@@ -355,6 +356,7 @@ error: 
	fsl_mc_cleanup_all_resource_pools(mc_bus_dev);

	return error;

}

EXPORT_SYMBOL_GPL(dprc_scan_container);



/**

 * dprc_irq0_handler - Regular ISR for DPRC interrupt 0

drivers/staging/fsl-mc/bus/fsl-mc-bus.c

+3 −2
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ EXPORT_SYMBOL_GPL(fsl_mc_driver_unregister); 
/**

 * 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)

{

	if (WARN_ON(!dev)) {
@@ -254,6 +254,7 @@ static void fsl_mc_get_root_dprc(struct device *dev, 
			*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,

			 int container_id, struct dprc_attributes *attr)

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

+8 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ struct fsl_mc_bus { 
#define to_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 msi_domain_info *info,

						struct irq_domain *parent);
@@ -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_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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE