Revert "staging: fsl-mc: move irq domain creation prototype to public header"

This reverts commit b32cdde14edec1c75a2190a39e810bf41fa29a7a.

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>

diff --git a/drivers/staging/fsl-mc/include/mc-bus.h b/drivers/staging/fsl-mc/include/mc-bus.h
index 0860681bddc60a948ca48e599122484a644d5d57..c1df43357c56186957f30b0cb3da2f7026753819 100644 (file)
--- a/drivers/staging/fsl-mc/include/mc-bus.h
+++ b/drivers/staging/fsl-mc/include/mc-bus.h
@@ -14,6 +14,9 @@
 #include "../include/mc.h"
 #include <linux/mutex.h>
 
+struct irq_domain;
+struct msi_domain_info;
+
 /**
  * Maximum number of total IRQs that can be pre-allocated for an MC bus'
  * IRQ pool
@@ -67,6 +70,10 @@ struct fsl_mc_bus {
 #define to_fsl_mc_bus(_mc_dev) \
        container_of(_mc_dev, struct fsl_mc_bus, mc_dev)
 
+struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode,
+                                               struct msi_domain_info *info,
+                                               struct irq_domain *parent);
+
 int fsl_mc_find_msi_domain(struct device *mc_platform_dev,
                           struct irq_domain **mc_msi_domain);
 

diff --git a/drivers/staging/fsl-mc/include/mc.h b/drivers/staging/fsl-mc/include/mc.h
index adb237845b40a7e80903545246b3efc34b540436..60c7067205311a1a7c0d86d61c73bc7176e2f4fe 100644 (file)
--- a/drivers/staging/fsl-mc/include/mc.h
+++ b/drivers/staging/fsl-mc/include/mc.h
@@ -18,9 +18,6 @@
 
 #define FSL_MC_VENDOR_FREESCALE        0x1957
 
-struct irq_domain;
-struct msi_domain_info;
-
 struct fsl_mc_device;
 struct fsl_mc_io;
 
@@ -236,10 +233,6 @@ int __must_check fsl_mc_object_allocate(struct fsl_mc_device *mc_dev,
 
 void fsl_mc_object_free(struct fsl_mc_device *mc_adev);
 
-struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode,
-                                               struct msi_domain_info *info,
-                                               struct irq_domain *parent);
-
 int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev);
 
 void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev);