X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=kernel%2Firq%2Fgeneric-chip.c;h=452d6f2ba21d9ae0b2b6cd1a966721b325ec9e23;hb=505608d2b9f3ab9e3ea0fd1b89b1cc560b91a7b5;hp=2f274f30b7e2d9ab218798cf6e3da2050f07da0e;hpb=4de563ae821b1935b3c467a4606e5738b0b0df87;p=karo-tx-linux.git

diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c
index 2f274f30b7e2..452d6f2ba21d 100644
--- a/kernel/irq/generic-chip.c
+++ b/kernel/irq/generic-chip.c
@@ -135,7 +135,7 @@ void irq_gc_ack_clr_bit(struct irq_data *d)
 }
 
 /**
- * irq_gc_mask_disable_reg_and_ack- Mask and ack pending interrupt
+ * irq_gc_mask_disable_reg_and_ack - Mask and ack pending interrupt
  * @d: irq_data
  */
 void irq_gc_mask_disable_reg_and_ack(struct irq_data *d)
@@ -275,10 +275,7 @@ int irq_alloc_domain_generic_chips(struct irq_domain *d, int irqs_per_chip,
 	if (d->gc)
 		return -EBUSY;
 
-	if (d->revmap_type != IRQ_DOMAIN_MAP_LINEAR)
-		return -EINVAL;
-
-	numchips = DIV_ROUND_UP(d->revmap_data.linear.size, irqs_per_chip);
+	numchips = DIV_ROUND_UP(d->revmap_size, irqs_per_chip);
 	if (!numchips)
 		return -EINVAL;
 
@@ -310,6 +307,7 @@ int irq_alloc_domain_generic_chips(struct irq_domain *d, int irqs_per_chip,
 		/* Calc pointer to the next generic chip */
 		tmp += sizeof(*gc) + num_ct * sizeof(struct irq_chip_type);
 	}
+	d->name = name;
 	return 0;
 }
 EXPORT_SYMBOL_GPL(irq_alloc_domain_generic_chips);