From: Greg Kroah-Hartman Date: Mon, 26 Jun 2017 11:50:58 +0000 (+0200) Subject: Revert "staging: fsl-mc: move irq domain creation prototype to public header" X-Git-Tag: v4.13-rc1~184^2~44 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3943749bc4518645c9440ed206f7e44038234f37;p=linux.git 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 Cc: Laurentiu Tudor Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/fsl-mc/include/mc-bus.h b/drivers/staging/fsl-mc/include/mc-bus.h index 0860681bddc6..c1df43357c56 100644 --- 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 +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 adb237845b40..60c706720531 100644 --- 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);