irqchip: Replace setup_irq() by request_irq()

request_irq() is preferred over setup_irq(). Invocations of setup_irq()
occur after memory allocators are ready.

Per tglx[1], setup_irq() existed in olden days when allocators were not
ready by the time early interrupts were initialized.

Hence replace setup_irq() by request_irq().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

Signed-off-by: afzal mohammed <afzal.mohd.ma@gmail.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200304004839.4729-1-afzal.mohd.ma@gmail.com

diff --git a/drivers/irqchip/irq-i8259.c b/drivers/irqchip/irq-i8259.c
index d000870..b6f6aa7 100644 (file)
--- a/drivers/irqchip/irq-i8259.c
+++ b/drivers/irqchip/irq-i8259.c
@@ -268,15 +268,6 @@ static void init_8259A(int auto_eoi)
        raw_spin_unlock_irqrestore(&i8259A_lock, flags);
 }
 
-/*
- * IRQ2 is cascade interrupt to second interrupt controller
- */
-static struct irqaction irq2 = {
-       .handler = no_action,
-       .name = "cascade",
-       .flags = IRQF_NO_THREAD,
-};
-
 static struct resource pic1_io_resource = {
        .name = "pic1",
        .start = PIC_MASTER_CMD,
@@ -311,6 +302,10 @@ static const struct irq_domain_ops i8259A_ops = {
  */
 struct irq_domain * __init __init_i8259_irqs(struct device_node *node)
 {
+       /*
+        * PIC_CASCADE_IR is cascade interrupt to second interrupt controller
+        */
+       int irq = I8259A_IRQ_BASE + PIC_CASCADE_IR;
        struct irq_domain *domain;
 
        insert_resource(&ioport_resource, &pic1_io_resource);
@@ -323,7 +318,8 @@ struct irq_domain * __init __init_i8259_irqs(struct device_node *node)
        if (!domain)
                panic("Failed to add i8259 IRQ domain");
 
-       setup_irq(I8259A_IRQ_BASE + PIC_CASCADE_IR, &irq2);
+       if (request_irq(irq, no_action, IRQF_NO_THREAD, "cascade", NULL))
+               pr_err("Failed to register cascade interrupt\n");
        register_syscore_ops(&i8259_syscore_ops);
        return domain;
 }

diff --git a/drivers/irqchip/irq-ingenic.c b/drivers/irqchip/irq-ingenic.c
index c5589ee..9f3da42 100644 (file)
--- a/drivers/irqchip/irq-ingenic.c
+++ b/drivers/irqchip/irq-ingenic.c
@@ -58,11 +58,6 @@ static irqreturn_t intc_cascade(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-static struct irqaction intc_cascade_action = {
-       .handler = intc_cascade,
-       .name = "SoC intc cascade interrupt",
-};
-
 static int __init ingenic_intc_of_init(struct device_node *node,
                                       unsigned num_chips)
 {
@@ -130,7 +125,9 @@ static int __init ingenic_intc_of_init(struct device_node *node,
                irq_reg_writel(gc, IRQ_MSK(32), JZ_REG_INTC_SET_MASK);
        }
 
-       setup_irq(parent_irq, &intc_cascade_action);
+       if (request_irq(parent_irq, intc_cascade, 0,
+                       "SoC intc cascade interrupt", NULL))
+               pr_err("Failed to register SoC intc cascade interrupt\n");
        return 0;
 
 out_domain_remove: