irq_domain: Remove references to old irq_host names

No functional changes.  Replaces non-exported references to 'host' with domain.
Does not change any symbol names referenced by other .c files.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Milton Miller <miltonm@bga.com>
Tested-by: Olof Johansson <olof@lixom.net>

1 files changed, 108 insertions, 111 deletions

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 8f7b91ce53c4..432d292b33f8 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -19,11 +19,11 @@ static DEFINE_MUTEX(irq_domain_mutex);
 #ifdef CONFIG_PPC
 static DEFINE_MUTEX(revmap_trees_mutex);
 static unsigned int irq_virq_count = NR_IRQS;
-static struct irq_domain *irq_default_host;
+static struct irq_domain *irq_default_domain;
 
-static int default_irq_host_match(struct irq_domain *h, struct device_node *np)
+static int default_irq_domain_match(struct irq_domain *d, struct device_node *np)
 {
-        return h->of_node != NULL && h->of_node == np;
+        return d->of_node != NULL && d->of_node == np;
 }
 
 /**
@@ -31,8 +31,8 @@ static int default_irq_host_match(struct irq_domain *h, struct device_node *np)
  * @of_node: optional device-tree node of the interrupt controller
  * @revmap_type: type of reverse mapping to use
  * @revmap_arg: for IRQ_DOMAIN_MAP_LINEAR linear only: size of the map
- * @ops: map/unmap host callbacks
- * @inval_irq: provide a hw number in that host space that is always invalid
+ * @ops: map/unmap domain callbacks
+ * @inval_irq: provide a hw number in that domain space that is always invalid
  *
  * Allocates and initialize and irq_domain structure. Note that in the case of
  * IRQ_DOMAIN_MAP_LEGACY, the map() callback will be called before this returns
@@ -48,7 +48,7 @@ struct irq_domain *irq_alloc_host(struct device_node *of_node,
                                 struct irq_domain_ops *ops,
                                 irq_hw_number_t inval_irq)
 {
-        struct irq_domain *host, *h;
+        struct irq_domain *domain, *h;
         unsigned int size = sizeof(struct irq_domain);
         unsigned int i;
         unsigned int *rmap;
@@ -56,18 +56,18 @@ struct irq_domain *irq_alloc_host(struct device_node *of_node,
         /* Allocate structure and revmap table if using linear mapping */
         if (revmap_type == IRQ_DOMAIN_MAP_LINEAR)
                 size += revmap_arg * sizeof(unsigned int);
-        host = kzalloc(size, GFP_KERNEL);
-        if (host == NULL)
+        domain = kzalloc(size, GFP_KERNEL);
+        if (domain == NULL)
                 return NULL;
 
         /* Fill structure */
-        host->revmap_type = revmap_type;
-        host->inval_irq = inval_irq;
-        host->ops = ops;
-        host->of_node = of_node_get(of_node);
+        domain->revmap_type = revmap_type;
+        domain->inval_irq = inval_irq;
+        domain->ops = ops;
+        domain->of_node = of_node_get(of_node);
 
-        if (host->ops->match == NULL)
-                host->ops->match = default_irq_host_match;
+        if (domain->ops->match == NULL)
+                domain->ops->match = default_irq_domain_match;
 
         mutex_lock(&irq_domain_mutex);
         /* Make sure only one legacy controller can be created */
@@ -75,53 +75,53 @@ struct irq_domain *irq_alloc_host(struct device_node *of_node,
                 list_for_each_entry(h, &irq_domain_list, link) {
                         if (WARN_ON(h->revmap_type == IRQ_DOMAIN_MAP_LEGACY)) {
                                 mutex_unlock(&irq_domain_mutex);
-                                of_node_put(host->of_node);
-                                kfree(host);
+                                of_node_put(domain->of_node);
+                                kfree(domain);
                                 return NULL;
                         }
                 }
         }
-        list_add(&host->link, &irq_domain_list);
+        list_add(&domain->link, &irq_domain_list);
         mutex_unlock(&irq_domain_mutex);
 
         /* Additional setups per revmap type */
         switch(revmap_type) {
         case IRQ_DOMAIN_MAP_LEGACY:
                 /* 0 is always the invalid number for legacy */
-                host->inval_irq = 0;
-                /* setup us as the host for all legacy interrupts */
+                domain->inval_irq = 0;
+                /* setup us as the domain for all legacy interrupts */
                 for (i = 1; i < NUM_ISA_INTERRUPTS; i++) {
                         struct irq_data *irq_data = irq_get_irq_data(i);
                         irq_data->hwirq = i;
-                        irq_data->domain = host;
+                        irq_data->domain = domain;
 
                         /* Legacy flags are left to default at this point,
                          * one can then use irq_create_mapping() to
                          * explicitly change them
                          */
-                        ops->map(host, i, i);
+                        ops->map(domain, i, i);
 
                         /* Clear norequest flags */
                         irq_clear_status_flags(i, IRQ_NOREQUEST);
                 }
                 break;
         case IRQ_DOMAIN_MAP_LINEAR:
-                rmap = (unsigned int *)(host + 1);
+                rmap = (unsigned int *)(domain + 1);
                 for (i = 0; i < revmap_arg; i++)
                         rmap[i] = 0;
-                host->revmap_data.linear.size = revmap_arg;
-                host->revmap_data.linear.revmap = rmap;
+                domain->revmap_data.linear.size = revmap_arg;
+                domain->revmap_data.linear.revmap = rmap;
                 break;
         case IRQ_DOMAIN_MAP_TREE:
-                INIT_RADIX_TREE(&host->revmap_data.tree, GFP_KERNEL);
+                INIT_RADIX_TREE(&domain->revmap_data.tree, GFP_KERNEL);
                 break;
         default:
                 break;
         }
 
-        pr_debug("irq: Allocated host of type %d @0x%p\n", revmap_type, host);
+        pr_debug("irq: Allocated domain of type %d @0x%p\n", revmap_type, domain);
 
-        return host;
+        return domain;
 }
 
 /**
@@ -150,18 +150,18 @@ EXPORT_SYMBOL_GPL(irq_find_host);
 
 /**
  * irq_set_default_host() - Set a "default" irq domain
- * @host: default host pointer
+ * @domain: default domain pointer
  *
  * For convenience, it's possible to set a "default" domain that will be used
  * whenever NULL is passed to irq_create_mapping(). It makes life easier for
  * platforms that want to manipulate a few hard coded interrupt numbers that
  * aren't properly represented in the device-tree.
  */
-void irq_set_default_host(struct irq_domain *host)
+void irq_set_default_host(struct irq_domain *domain)
 {
-        pr_debug("irq: Default host set to @0x%p\n", host);
+        pr_debug("irq: Default domain set to @0x%p\n", domain);
 
-        irq_default_host = host;
+        irq_default_domain = domain;
 }