Skip to content

Commit

Permalink
irq_domain: remove NO_IRQ from irq domain code
Browse files Browse the repository at this point in the history
zero always means no irq when using irq domains.  Get rid of the NO_IRQ
references.

Signed-off-by: Grant Likely <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Milton Miller <[email protected]>
Tested-by: Olof Johansson <[email protected]>
  • Loading branch information
glikely committed Feb 16, 2012
1 parent cc79ca6 commit 0384837
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions kernel/irq/irqdomain.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ struct irq_domain *irq_alloc_host(struct device_node *of_node,
case IRQ_DOMAIN_MAP_LINEAR:
rmap = (unsigned int *)(host + 1);
for (i = 0; i < revmap_arg; i++)
rmap[i] = NO_IRQ;
rmap[i] = 0;
host->revmap_data.linear.size = revmap_arg;
host->revmap_data.linear.revmap = rmap;
break;
Expand Down Expand Up @@ -218,9 +218,9 @@ unsigned int irq_create_direct_mapping(struct irq_domain *host)
WARN_ON(host->revmap_type != IRQ_DOMAIN_MAP_NOMAP);

virq = irq_alloc_desc_from(1, 0);
if (virq == NO_IRQ) {
if (!virq) {
pr_debug("irq: create_direct virq allocation failed\n");
return NO_IRQ;
return 0;
}
if (virq >= irq_virq_count) {
pr_err("ERROR: no free irqs available below %i maximum\n",
Expand All @@ -233,7 +233,7 @@ unsigned int irq_create_direct_mapping(struct irq_domain *host)

if (irq_setup_virq(host, virq, virq)) {
irq_free_desc(virq);
return NO_IRQ;
return 0;
}

return virq;
Expand Down Expand Up @@ -263,13 +263,13 @@ unsigned int irq_create_mapping(struct irq_domain *host,
printk(KERN_WARNING "irq_create_mapping called for"
" NULL host, hwirq=%lx\n", hwirq);
WARN_ON(1);
return NO_IRQ;
return 0;
}
pr_debug("irq: -> using host @%p\n", host);

/* Check if mapping already exists */
virq = irq_find_mapping(host, hwirq);
if (virq != NO_IRQ) {
if (virq) {
pr_debug("irq: -> existing mapping on virq %d\n", virq);
return virq;
}
Expand All @@ -279,7 +279,7 @@ unsigned int irq_create_mapping(struct irq_domain *host,
/* Handle legacy */
virq = (unsigned int)hwirq;
if (virq == 0 || virq >= NUM_ISA_INTERRUPTS)
return NO_IRQ;
return 0;
return virq;
} else {
/* Allocate a virtual interrupt number */
Expand All @@ -289,16 +289,16 @@ unsigned int irq_create_mapping(struct irq_domain *host,
virq = irq_alloc_desc_from(hint, 0);
if (!virq)
virq = irq_alloc_desc_from(1, 0);
if (virq == NO_IRQ) {
if (!virq) {
pr_debug("irq: -> virq allocation failed\n");
return NO_IRQ;
return 0;
}
}

if (irq_setup_virq(host, virq, hwirq)) {
if (host->revmap_type != IRQ_DOMAIN_MAP_LEGACY)
irq_free_desc(virq);
return NO_IRQ;
return 0;
}

pr_debug("irq: irq %lu on host %s mapped to virtual irq %u\n",
Expand All @@ -323,7 +323,7 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
if (host == NULL) {
printk(KERN_WARNING "irq: no irq host found for %s !\n",
controller->full_name);
return NO_IRQ;
return 0;
}

/* If host has no translation, then we assume interrupt line */
Expand All @@ -332,12 +332,12 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
else {
if (host->ops->xlate(host, controller, intspec, intsize,
&hwirq, &type))
return NO_IRQ;
return 0;
}

/* Create mapping */
virq = irq_create_mapping(host, hwirq);
if (virq == NO_IRQ)
if (!virq)
return virq;

/* Set type if specified and different than the current one */
Expand All @@ -358,7 +358,7 @@ void irq_dispose_mapping(unsigned int virq)
struct irq_domain *host;
irq_hw_number_t hwirq;

if (virq == NO_IRQ || !irq_data)
if (!virq || !irq_data)
return;

host = irq_data->domain;
Expand Down Expand Up @@ -387,7 +387,7 @@ void irq_dispose_mapping(unsigned int virq)
switch(host->revmap_type) {
case IRQ_DOMAIN_MAP_LINEAR:
if (hwirq < host->revmap_data.linear.size)
host->revmap_data.linear.revmap[hwirq] = NO_IRQ;
host->revmap_data.linear.revmap[hwirq] = 0;
break;
case IRQ_DOMAIN_MAP_TREE:
mutex_lock(&revmap_trees_mutex);
Expand Down Expand Up @@ -422,7 +422,7 @@ unsigned int irq_find_mapping(struct irq_domain *host,
if (host == NULL)
host = irq_default_host;
if (host == NULL)
return NO_IRQ;
return 0;

/* legacy -> bail early */
if (host->revmap_type == IRQ_DOMAIN_MAP_LEGACY)
Expand All @@ -440,7 +440,7 @@ unsigned int irq_find_mapping(struct irq_domain *host,
if (i >= irq_virq_count)
i = 1;
} while(i != hint);
return NO_IRQ;
return 0;
}
EXPORT_SYMBOL_GPL(irq_find_mapping);

Expand Down Expand Up @@ -493,7 +493,7 @@ void irq_radix_revmap_insert(struct irq_domain *host, unsigned int virq,
if (WARN_ON(host->revmap_type != IRQ_DOMAIN_MAP_TREE))
return;

if (virq != NO_IRQ) {
if (virq) {
mutex_lock(&revmap_trees_mutex);
radix_tree_insert(&host->revmap_data.tree, hwirq, irq_data);
mutex_unlock(&revmap_trees_mutex);
Expand Down Expand Up @@ -527,7 +527,7 @@ unsigned int irq_linear_revmap(struct irq_domain *host,
return irq_find_mapping(host, hwirq);

/* Fill up revmap with slow path if no mapping found */
if (unlikely(revmap[hwirq] == NO_IRQ))
if (unlikely(!revmap[hwirq]))
revmap[hwirq] = irq_find_mapping(host, hwirq);

return revmap[hwirq];
Expand Down

0 comments on commit 0384837

Please sign in to comment.