UBUNTU: SAUCE: irqchip: gicv3-its: platform-msi: refactor its_pmsi_init() to prepare...

Introduce its_pmsi_init_one() to refactor the code to isolate
ACPI&DT common code to prepare for ACPI later.

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Reviewed-by: Matthias Brugger <mbrugger@suse.com>
Tested-by: Ming Lei <ming.lei@canonical.com>
Tested-by: Wei Xu <xuwei5@hisilicon.com>
Tested-by: Sinan Kaya <okaya@codeaurora.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Tomasz Nowicki <tn@semihalf.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
[v8 submission from:
 https://www.spinics.net/lists/arm-kernel/msg555502.html ]
BugLink: http://bugs.launchpad.net/bugs/1669061
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/irqchip/irq-gic-v3-its-platform-msi.c b/drivers/irqchip/irq-gic-v3-its-platform-msi.c
index 3c94278fc8678078ae6ee5e778a1f46f4713fd9c..3d9efd14a63f239f6b8b905b5e8412dfe1610188 100644 (file)
--- a/drivers/irqchip/irq-gic-v3-its-platform-msi.c
+++ b/drivers/irqchip/irq-gic-v3-its-platform-msi.c
@@ -82,34 +82,43 @@ static struct of_device_id its_device_id[] = {
        {},
 };
 
-static int __init its_pmsi_init(void)
+static int __init its_pmsi_init_one(struct fwnode_handle *fwnode,
+                               const char *name)
 {
-       struct device_node *np;
        struct irq_domain *parent;
 
+       parent = irq_find_matching_fwnode(fwnode, DOMAIN_BUS_NEXUS);
+       if (!parent || !msi_get_domain_info(parent)) {
+               pr_err("%s: unable to locate ITS domain\n", name);
+               return -ENXIO;
+       }
+
+       if (!platform_msi_create_irq_domain(fwnode, &its_pmsi_domain_info,
+                                           parent)) {
+               pr_err("%s: unable to create platform domain\n", name);
+               return -ENXIO;
+       }
+
+       pr_info("Platform MSI: %s domain created\n", name);
+       return 0;
+}
+
+static void __init its_pmsi_of_init(void)
+{
+       struct device_node *np;
+
        for (np = of_find_matching_node(NULL, its_device_id); np;
             np = of_find_matching_node(np, its_device_id)) {
                if (!of_property_read_bool(np, "msi-controller"))
                        continue;
 
-               parent = irq_find_matching_host(np, DOMAIN_BUS_NEXUS);
-               if (!parent || !msi_get_domain_info(parent)) {
-                       pr_err("%s: unable to locate ITS domain\n",
-                              np->full_name);
-                       continue;
-               }
-
-               if (!platform_msi_create_irq_domain(of_node_to_fwnode(np),
-                                                   &its_pmsi_domain_info,
-                                                   parent)) {
-                       pr_err("%s: unable to create platform domain\n",
-                              np->full_name);
-                       continue;
-               }
-
-               pr_info("Platform MSI: %s domain created\n", np->full_name);
+               its_pmsi_init_one(of_node_to_fwnode(np), np->full_name);
        }
+}
 
+static int __init its_pmsi_init(void)
+{
+       its_pmsi_of_init();
        return 0;
 }
 early_initcall(its_pmsi_init);