Skip to contentSkip to conversation

blackfin: Interrupt cleanups and API change preparation

PATCH New Thomas Gleixner 2 participants 5 messages Jul 13, 2015 – Jul 27, 2015

lore
Share & tools
lore
#0 lore raw

cover blackfin: Interrupt cleanups and API change preparation

The following patch series contains the following changes:

- Consolidation of chained interrupt handler setup/removal

- Switch to functions which avoid a redundant interrupt descriptor lookup

- Preparation of interrupt flow handlers for the 'irq' argument removal

The series has no dependencies and is also available as a git branch for your convenience:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/blackfin

If you want me to carry the patches in the irq/core branch of tip, please let me know.

Thanks,

tglx

#1 lore raw

PATCH 1/2 blackfin/irq: Use access helper irq_data_get_affinity_mask()

From: Jiang Liu <[email protected]>

This is a preparatory patch for moving irq_data struct members.

---
 arch/blackfin/mach-common/ints-priority.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/blackfin/mach-common/ints-priority.c +2 -1
Index: tip/arch/blackfin/mach-common/ints-priority.c
===================================================================
@@ -194,7 +194,8 @@ void bfin_internal_unmask_irq(unsigned i
 #ifdef CONFIG_SMP
 static void bfin_internal_unmask_irq_chip(struct irq_data *d)
 {
-	bfin_internal_unmask_irq_affinity(d->irq, d->affinity);
+	bfin_internal_unmask_irq_affinity(d->irq,
+					  irq_data_get_affinity_mask(d));
 }
 
 static int bfin_internal_set_affinity(struct irq_data *d,
#2 lore raw

[tip:irq/core] blackfin/irq: Use access helper irq_data_get_affinity_mask()

blackfin/irq: Use access helper irq_data_get_affinity_mask()
Commit-ID:  247bd4f1f11eb683bdb31850b525fb5e893bd49d
Gitweb:     http://git.kernel.org/tip/247bd4f1f11eb683bdb31850b525fb5e893bd49d
Author:     Jiang Liu <[email protected]>
AuthorDate: Mon, 13 Jul 2015 20:34:56 +0000
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 27 Jul 2015 13:36:37 +0200

blackfin/irq: Use access helper irq_data_get_affinity_mask()

This is a preparatory patch for moving irq_data struct members.

---
 arch/blackfin/mach-common/ints-priority.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/blackfin/mach-common/ints-priority.c +2 -1
index 7236bdf..332a434 100644
@@ -194,7 +194,8 @@ void bfin_internal_unmask_irq(unsigned int irq)
 #ifdef CONFIG_SMP
 static void bfin_internal_unmask_irq_chip(struct irq_data *d)
 {
-	bfin_internal_unmask_irq_affinity(d->irq, d->affinity);
+	bfin_internal_unmask_irq_affinity(d->irq,
+					  irq_data_get_affinity_mask(d));
 }
 
 static int bfin_internal_set_affinity(struct irq_data *d,
#3 lore raw

PATCH 2/2 blackfin/irq: Use irq_set_handler_locked()

In reply to Thomas Gleixner

Use irq_set_handler_locked() as it avoids a redundant lookup of the irq descriptor.

Search and update was done with coccinelle.

---
 arch/blackfin/mach-common/ints-priority.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/blackfin/mach-common/ints-priority.c +4 -4
Index: tip/arch/blackfin/mach-common/ints-priority.c
===================================================================
@@ -686,12 +686,12 @@ void bfin_demux_mac_status_irq(unsigned
 }
 #endif
 
-static inline void bfin_set_irq_handler(unsigned irq, irq_flow_handler_t handle)
+static inline void bfin_set_irq_handler(struct irq_data *d, irq_flow_handler_t handle)
 {
 #ifdef CONFIG_IPIPE
 	handle = handle_level_irq;
 #endif
-	__irq_set_handler_locked(irq, handle);
+	irq_set_handler_locked(d, handle);
 }
 
 #ifdef CONFIG_GPIO_ADI
@@ -803,9 +803,9 @@ static int bfin_gpio_irq_type(struct irq
 	}
 
 	if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))
-		bfin_set_irq_handler(irq, handle_edge_irq);
+		bfin_set_irq_handler(d, handle_edge_irq);
 	else
-		bfin_set_irq_handler(irq, handle_level_irq);
+		bfin_set_irq_handler(d, handle_level_irq);
 
 	return 0;
 }
#4 lore raw

[tip:irq/core] blackfin/irq: Use irq_set_handler_locked()

blackfin/irq: Use irq_set_handler_locked()
Commit-ID:  284384442fd44f6e01a157745b5549602e6a49f4
Gitweb:     http://git.kernel.org/tip/284384442fd44f6e01a157745b5549602e6a49f4
Author:     Thomas Gleixner <[email protected]>
AuthorDate: Mon, 13 Jul 2015 20:34:57 +0000
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 27 Jul 2015 13:36:37 +0200

blackfin/irq: Use irq_set_handler_locked()

Use irq_set_handler_locked() as it avoids a redundant lookup of the irq descriptor.

Search and update was done with coccinelle.

---
 arch/blackfin/mach-common/ints-priority.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/blackfin/mach-common/ints-priority.c +4 -4
index 332a434..2eaf83a 100644
@@ -686,12 +686,12 @@ void bfin_demux_mac_status_irq(unsigned int int_err_irq,
 }
 #endif
 
-static inline void bfin_set_irq_handler(unsigned irq, irq_flow_handler_t handle)
+static inline void bfin_set_irq_handler(struct irq_data *d, irq_flow_handler_t handle)
 {
 #ifdef CONFIG_IPIPE
 	handle = handle_level_irq;
 #endif
-	__irq_set_handler_locked(irq, handle);
+	irq_set_handler_locked(d, handle);
 }
 
 #ifdef CONFIG_GPIO_ADI
@@ -803,9 +803,9 @@ static int bfin_gpio_irq_type(struct irq_data *d, unsigned int type)
 	}
 
 	if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))
-		bfin_set_irq_handler(irq, handle_edge_irq);
+		bfin_set_irq_handler(d, handle_edge_irq);
 	else
-		bfin_set_irq_handler(irq, handle_level_irq);
+		bfin_set_irq_handler(d, handle_level_irq);
 
 	return 0;
 }