Skip to contentSkip to conversation

irqchip/i8259: Convert to use irq_set_chained_handler_and_data

PATCH New Axel Lin 2 participants 2 messages Oct 1, 2015 irqchip drivers

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 irqchip/i8259: Convert to use irq_set_chained_handler_and_data

Chained irq handlers usually set up handler data as well. We now have a function to set both under irq_desc->lock. Replace the two calls with one.

---
 drivers/irqchip/irq-i8259.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/irq-i8259.c +2 -2
index e484fd2..6b304eb 100644
@@ -377,8 +377,8 @@ int __init i8259_of_init(struct device_node *node, struct device_node *parent)
 	}
 
 	domain = __init_i8259_irqs(node);
-	irq_set_handler_data(parent_irq, domain);
-	irq_set_chained_handler(parent_irq, i8259_irq_dispatch);
+	irq_set_chained_handler_and_data(parent_irq, i8259_irq_dispatch,
+					 domain);
 	return 0;
 }
 IRQCHIP_DECLARE(i8259, "intel,i8259", i8259_of_init);
Signature · 1 line
2.1.4
#1 lore raw
irqchip/i8259: Convert to use irq_set_chained_handler_and_data
Commit-ID:  a51e80d002b63bbdaff3229f3ebf4fbb53c75c33
Gitweb:     http://git.kernel.org/tip/a51e80d002b63bbdaff3229f3ebf4fbb53c75c33
Author:     Axel Lin <[email protected]>
AuthorDate: Thu, 1 Oct 2015 22:26:44 +0800
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Thu, 1 Oct 2015 16:32:54 +0200

irqchip/i8259: Convert to use irq_set_chained_handler_and_data

Chained irq handlers usually set up handler data as well. We now have a function to set both under irq_desc->lock. Replace the two calls with one.

---
 drivers/irqchip/irq-i8259.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/irq-i8259.c +2 -2
index e484fd2..6b304eb 100644
@@ -377,8 +377,8 @@ int __init i8259_of_init(struct device_node *node, struct device_node *parent)
 	}
 
 	domain = __init_i8259_irqs(node);
-	irq_set_handler_data(parent_irq, domain);
-	irq_set_chained_handler(parent_irq, i8259_irq_dispatch);
+	irq_set_chained_handler_and_data(parent_irq, i8259_irq_dispatch,
+					 domain);
 	return 0;
 }
 IRQCHIP_DECLARE(i8259, "intel,i8259", i8259_of_init);