@@ -268,7 +268,7 @@ static struct irq_chip mpic_msi_bottom_irq_chip = {
.irq_set_affinity = mpic_msi_set_affinity,
};
-static int mpic_msi_alloc(struct irq_domain *domain, unsigned int virq,
+static int mpic_msi_alloc(struct irq_domain *h, unsigned int virq,
unsigned int nr_irqs, void *args)
{
int hwirq;
@@ -282,18 +282,18 @@ static int mpic_msi_alloc(struct irq_domain *domain, unsigned int virq,
return -ENOSPC;
for (unsigned int i = 0; i < nr_irqs; i++)
- irq_domain_set_info(domain, virq + i, hwirq + i,
+ irq_domain_set_info(h, virq + i, hwirq + i,
&mpic_msi_bottom_irq_chip,
- domain->host_data, handle_simple_irq,
+ h->host_data, handle_simple_irq,
NULL, NULL);
return 0;
}
-static void mpic_msi_free(struct irq_domain *domain, unsigned int virq,
+static void mpic_msi_free(struct irq_domain *h, unsigned int virq,
unsigned int nr_irqs)
{
- struct irq_data *d = irq_domain_get_irq_data(domain, virq);
+ struct irq_data *d = irq_domain_get_irq_data(h, virq);
mutex_lock(&msi_used_lock);
bitmap_release_region(msi_used, d->hwirq, order_base_2(nr_irqs));
@@ -426,20 +426,20 @@ static struct irq_chip mpic_ipi_irqchip = {
.ipi_send_mask = mpic_ipi_send_mask,
};
-static int mpic_ipi_alloc(struct irq_domain *d, unsigned int virq,
+static int mpic_ipi_alloc(struct irq_domain *h, unsigned int virq,
unsigned int nr_irqs, void *args)
{
for (unsigned int i = 0; i < nr_irqs; i++) {
irq_set_percpu_devid(virq + i);
- irq_domain_set_info(d, virq + i, i, &mpic_ipi_irqchip,
- d->host_data, handle_percpu_devid_irq,
+ irq_domain_set_info(h, virq + i, i, &mpic_ipi_irqchip,
+ h->host_data, handle_percpu_devid_irq,
NULL, NULL);
}
return 0;
}
-static void mpic_ipi_free(struct irq_domain *d, unsigned int virq,
+static void mpic_ipi_free(struct irq_domain *h, unsigned int virq,
unsigned int nr_irqs)
{
/* Not freeing IPIs */
Rename struct irq_domain variables passed as arguments into callbacks to "h", for consistency. The "d" name is reserved for irq_data, while "domain" is unnecessarily long. Signed-off-by: Marek Behún <kabel@kernel.org> --- drivers/irqchip/irq-armada-370-xp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)