set_handle_irq: Return EBUSY if the handler has already been registered.

This is what's expected by the comments and at least by irq-riscv-intc.c

Signed-off-by Shea Levy <[email protected]>

---
 include/linux/irq.h | 2 +-
 kernel/irq/handle.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

include/linux/irq.h +1 -1

index 2930fd2572e4..77e97872a13e 100644
@@ -1179,7 +1179,7 @@ int ipi_send_mask(unsigned int virq, const struct cpumask *dest);
  * Returns 0 on success, or -EBUSY if an IRQ handler has already been
  * registered.
  */
-void __init set_handle_irq(void (*handle_irq)(struct pt_regs *));
+int __init set_handle_irq(void (*handle_irq)(struct pt_regs *));
 
 /*
  * Allows interrupt handlers to find the irqchip that's been registered as the

kernel/irq/handle.c +3 -2

index dee4f9a172ca..3570c715c3e7 100644
@@ -213,11 +213,12 @@ irqreturn_t handle_irq_event(struct irq_desc *desc)
 }
 
 #ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER
-void __init set_handle_irq(void (*handle_irq)(struct pt_regs *))
+int __init set_handle_irq(void (*handle_irq)(struct pt_regs *))
 {
 	if (handle_arch_irq)
-		return;
+		return -EBUSY;
 
 	handle_arch_irq = handle_irq;
+	return 0;
 }
 #endif

Signature · 1 line

2.16.1

Hi all,

Any thoughts on this?

Thanks,
Shea

Quoted 41 lines · Shea Levy

This is what's expected by the comments and at least by irq-riscv-intc.c

Signed-off-by Shea Levy <[email protected]>

---
 include/linux/irq.h | 2 +-
 kernel/irq/handle.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

include/linux/irq.h +1 -1

index 2930fd2572e4..77e97872a13e 100644
@@ -1179,7 +1179,7 @@ int ipi_send_mask(unsigned int virq, const struct cpumask *dest);
  * Returns 0 on success, or -EBUSY if an IRQ handler has already been
  * registered.
  */
-void __init set_handle_irq(void (*handle_irq)(struct pt_regs *));
+int __init set_handle_irq(void (*handle_irq)(struct pt_regs *));
 
 /*
  * Allows interrupt handlers to find the irqchip that's been registered as the

kernel/irq/handle.c +3 -3

index dee4f9a172ca..3570c715c3e7 100644
@@ -213,11 +213,12 @@ irqreturn_t handle_irq_event(struct irq_desc *desc)
 }
 
 #ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER
-void __init set_handle_irq(void (*handle_irq)(struct pt_regs *))
+int __init set_handle_irq(void (*handle_irq)(struct pt_regs *))
 {
 	if (handle_arch_irq)
-		return;
+		return -EBUSY;
 
 	handle_arch_irq = handle_irq;
+	return 0;
 }
 #endif
--

Quoted 1 line

2.16.1

_______________________________________________
linux-riscv mailing list
linux-riscv at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

I squashed it into the patch set I just sent out -- sorry, I thought I got your OK for it. Is that OK?

Quoted 56 lines · shea at shealevy.com

Hi all,

Any thoughts on this?

Thanks,
Shea

Quoted 41 lines · Shea Levy

This is what's expected by the comments and at least by irq-riscv-intc.c

Signed-off-by Shea Levy <[email protected]>

---
 include/linux/irq.h | 2 +-
 kernel/irq/handle.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

include/linux/irq.h +1 -1

index 2930fd2572e4..77e97872a13e 100644
@@ -1179,7 +1179,7 @@ int ipi_send_mask(unsigned int virq, const struct cpumask *dest);
  * Returns 0 on success, or -EBUSY if an IRQ handler has already been
  * registered.
  */
-void __init set_handle_irq(void (*handle_irq)(struct pt_regs *));
+int __init set_handle_irq(void (*handle_irq)(struct pt_regs *));
 
 /*
  * Allows interrupt handlers to find the irqchip that's been registered as the

kernel/irq/handle.c +3 -3

index dee4f9a172ca..3570c715c3e7 100644
@@ -213,11 +213,12 @@ irqreturn_t handle_irq_event(struct irq_desc *desc)
 }
 
 #ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER
-void __init set_handle_irq(void (*handle_irq)(struct pt_regs *))
+int __init set_handle_irq(void (*handle_irq)(struct pt_regs *))
 {
 	if (handle_arch_irq)
-		return;
+		return -EBUSY;
 
 	handle_arch_irq = handle_irq;
+	return 0;
 }
 #endif
--

Quoted 1 line

2.16.1

_______________________________________________
linux-riscv mailing list
linux-riscv at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv