irqchip/stm32: Optimizes and cleans up stm32-exti irq_domain

Radoslaw Pietrzyk · Marc Zyngier · commit ff78716d4317 · 2018-05-24T12:37:54.000+01:00
- In stm32_exti_alloc function, discards irq_domain_set_info
  with handle_simple_irq. This overwrite the setting defined while init
  of generic chips. Exti controller manages edge irq type.
- Removes acking in chained irq handler as this is done by
  irq_chip itself inside handle_edge_irq
- removes unneeded irq_domain_ops.xlate callback

Acked-by: Ludovic Barre &lt;ludovic.barre@st.com&gt;
Tested-by: Ludovic Barre &lt;ludovic.barre@st.com&gt;
Signed-off-by: Radoslaw Pietrzyk &lt;radoslaw.pietrzyk@gmail.com&gt;
Signed-off-by: Ludovic Barre &lt;ludovic.barre@st.com&gt;
Signed-off-by: Marc Zyngier &lt;marc.zyngier@arm.com&gt;
diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-exti.c
@@ -79,13 +79,6 @@ static unsigned long stm32_exti_pending(struct irq_chip_generic *gc)
 	return irq_reg_readl(gc, stm32_bank->pr_ofst);
 }
 
-static void stm32_exti_irq_ack(struct irq_chip_generic *gc, u32 mask)
-{
-	const struct stm32_exti_bank *stm32_bank = gc->private;
-
-	irq_reg_writel(gc, mask, stm32_bank->pr_ofst);
-}
-
 static void stm32_irq_handler(struct irq_desc *desc)
 {
 	struct irq_domain *domain = irq_desc_get_handler_data(desc);
@@ -106,7 +99,6 @@ static void stm32_irq_handler(struct irq_desc *desc)
 			for_each_set_bit(n, &pending, IRQS_PER_BANK) {
 				virq = irq_find_mapping(domain, irq_base + n);
 				generic_handle_irq(virq);
-				stm32_exti_irq_ack(gc, BIT(n));
 			}
 		}
 	}
@@ -176,16 +168,12 @@ static int stm32_irq_set_wake(struct irq_data *data, unsigned int on)
 static int stm32_exti_alloc(struct irq_domain *d, unsigned int virq,
 			    unsigned int nr_irqs, void *data)
 {
-	struct irq_chip_generic *gc;
 	struct irq_fwspec *fwspec = data;
 	irq_hw_number_t hwirq;
 
 	hwirq = fwspec->param[0];
-	gc = irq_get_domain_generic_chip(d, hwirq);
 
 	irq_map_generic_chip(d, virq, hwirq);
-	irq_domain_set_info(d, virq, hwirq, &gc->chip_types->chip, gc,
-			    handle_simple_irq, NULL, NULL);
 
 	return 0;
 }
@@ -200,7 +188,6 @@ static void stm32_exti_free(struct irq_domain *d, unsigned int virq,
 
 struct irq_domain_ops irq_exti_domain_ops = {
 	.map	= irq_map_generic_chip,
-	.xlate	= irq_domain_xlate_onetwocell,
 	.alloc  = stm32_exti_alloc,
 	.free	= stm32_exti_free,
 };

Original file line number	Diff line number	Diff line change
`@@ -79,13 +79,6 @@ static unsigned long stm32_exti_pending(struct irq_chip_generic *gc)`
`79`	`79`	`return irq_reg_readl(gc, stm32_bank->pr_ofst);`
`80`	`80`	`}`
`81`	`81`
`82`		`-static void stm32_exti_irq_ack(struct irq_chip_generic *gc, u32 mask)`
`83`		`-{`
`84`		`- const struct stm32_exti_bank *stm32_bank = gc->private;`
`85`		`-`
`86`		`- irq_reg_writel(gc, mask, stm32_bank->pr_ofst);`
`87`		`-}`
`88`		`-`
`89`	`82`	`static void stm32_irq_handler(struct irq_desc *desc)`
`90`	`83`	`{`
`91`	`84`	`struct irq_domain *domain = irq_desc_get_handler_data(desc);`
`@@ -106,7 +99,6 @@ static void stm32_irq_handler(struct irq_desc *desc)`
`106`	`99`	`for_each_set_bit(n, &pending, IRQS_PER_BANK) {`
`107`	`100`	`virq = irq_find_mapping(domain, irq_base + n);`
`108`	`101`	`generic_handle_irq(virq);`
`109`		`- stm32_exti_irq_ack(gc, BIT(n));`
`110`	`102`	`}`
`111`	`103`	`}`
`112`	`104`	`}`
`@@ -176,16 +168,12 @@ static int stm32_irq_set_wake(struct irq_data *data, unsigned int on)`
`176`	`168`	`static int stm32_exti_alloc(struct irq_domain *d, unsigned int virq,`
`177`	`169`	`unsigned int nr_irqs, void *data)`
`178`	`170`	`{`
`179`		`- struct irq_chip_generic *gc;`
`180`	`171`	`struct irq_fwspec *fwspec = data;`
`181`	`172`	`irq_hw_number_t hwirq;`
`182`	`173`
`183`	`174`	`hwirq = fwspec->param[0];`
`184`		`- gc = irq_get_domain_generic_chip(d, hwirq);`
`185`	`175`
`186`	`176`	`irq_map_generic_chip(d, virq, hwirq);`
`187`		`- irq_domain_set_info(d, virq, hwirq, &gc->chip_types->chip, gc,`
`188`		`- handle_simple_irq, NULL, NULL);`
`189`	`177`
`190`	`178`	`return 0;`
`191`	`179`	`}`
`@@ -200,7 +188,6 @@ static void stm32_exti_free(struct irq_domain *d, unsigned int virq,`
`200`	`188`
`201`	`189`	`struct irq_domain_ops irq_exti_domain_ops = {`
`202`	`190`	`.map = irq_map_generic_chip,`
`203`		`- .xlate = irq_domain_xlate_onetwocell,`
`204`	`191`	`.alloc = stm32_exti_alloc,`
`205`	`192`	`.free = stm32_exti_free,`
`206`	`193`	`};`