Skip to contentSkip to conversation

ARM: davinci: cp_intc: use IRQCHIP_SKIP_SET_WAKE instead of irq_set_wake callback

PATCH New Sudeep Holla 3 participants 4 messages Jul 3, 2015 – Aug 5, 2015

Subsystems (3)
Arm (32-bit) Arm sub-architectures TI DaVinci machine support
lore
Share & tools
lore

Sudeep Holla

author
#0 lore raw

PATCH 1/1 ARM: davinci: cp_intc: use IRQCHIP_SKIP_SET_WAKE instead of irq_set_wake callback

Commit 60f96b41f71d ("genirq: Add IRQCHIP_SKIP_SET_WAKE flag") introduced a new flag to skip the irq_set_wake callback in the irqchip core to avoid adding dummy irq_set_wake in the irqchip implementations.

This patch removes the dummy callback and sets the IRQCHIP_SKIP_SET_WAKE flags.

Cc Sekhar Nori <[email protected]>
Cc Kevin Hilman <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
---
 arch/arm/mach-davinci/cp_intc.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
arch/arm/mach-davinci/cp_intc.c +1 -11
index 006dae8dfe44..9fda75c18c04 100644
@@ -85,23 +85,13 @@ static int cp_intc_set_irq_type(struct irq_data *d, unsigned int flow_type)
 	return 0;
 }
 
-/*
- * Faking this allows us to to work with suspend functions of
- * generic drivers which call {enable|disable}_irq_wake for
- * wake up interrupt sources (eg RTC on DA850).
- */
-static int cp_intc_set_wake(struct irq_data *d, unsigned int on)
-{
-	return 0;
-}
-
 static struct irq_chip cp_intc_irq_chip = {
 	.name		= "cp_intc",
 	.irq_ack	= cp_intc_ack_irq,
 	.irq_mask	= cp_intc_mask_irq,
 	.irq_unmask	= cp_intc_unmask_irq,
 	.irq_set_type	= cp_intc_set_irq_type,
-	.irq_set_wake	= cp_intc_set_wake,
+	.flags		= IRQCHIP_SKIP_SET_WAKE,
 };
 
 static struct irq_domain *cp_intc_domain;
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 ARM: davinci: cp_intc: use IRQCHIP_SKIP_SET_WAKE instead of irq_set_wake callback

Quoted 10 lines · Sudeep Holla

Commit 60f96b41f71d ("genirq: Add IRQCHIP_SKIP_SET_WAKE flag") introduced a new flag to skip the irq_set_wake callback in the irqchip core to avoid adding dummy irq_set_wake in the irqchip implementations.

This patch removes the dummy callback and sets the IRQCHIP_SKIP_SET_WAKE flags.

Cc Sekhar Nori <[email protected]>
Cc Kevin Hilman <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>

The patch looks good and I have queued in my testing branch for v4.3. I have not been able to test it yet.

Thanks,
Sekhar

#2 lore raw

PATCH 1/1 ARM: davinci: cp_intc: use IRQCHIP_SKIP_SET_WAKE instead of irq_set_wake callback

In reply to Sudeep Holla

From: Sudeep Holla <[email protected]>

Commit 60f96b41f71d ("genirq: Add IRQCHIP_SKIP_SET_WAKE flag") introduced a new flag to skip the irq_set_wake callback in the irqchip core to avoid adding dummy irq_set_wake in the irqchip implementations.

This patch removes the dummy callback and sets the IRQCHIP_SKIP_SET_WAKE flags.

Cc Sekhar Nori <[email protected]>
Cc Kevin Hilman <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
Signed-off-by Sekhar Nori <[email protected]>

---
ARM-SoC, can you please apply this patch directly? I do not have any other patches queued, so not sending a pull request.

 arch/arm/mach-davinci/cp_intc.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
arch/arm/mach-davinci/cp_intc.c +1 -11
index 006dae8dfe44..9fda75c18c04 100644
@@ -85,23 +85,13 @@ static int cp_intc_set_irq_type(struct irq_data *d, unsigned int flow_type)
 	return 0;
 }
 
-/*
- * Faking this allows us to to work with suspend functions of
- * generic drivers which call {enable|disable}_irq_wake for
- * wake up interrupt sources (eg RTC on DA850).
- */
-static int cp_intc_set_wake(struct irq_data *d, unsigned int on)
-{
-	return 0;
-}
-
 static struct irq_chip cp_intc_irq_chip = {
 	.name		= "cp_intc",
 	.irq_ack	= cp_intc_ack_irq,
 	.irq_mask	= cp_intc_mask_irq,
 	.irq_unmask	= cp_intc_unmask_irq,
 	.irq_set_type	= cp_intc_set_irq_type,
-	.irq_set_wake	= cp_intc_set_wake,
+	.flags		= IRQCHIP_SKIP_SET_WAKE,
 };
 
 static struct irq_domain *cp_intc_domain;
Signature · 1 line
2.4.4.408.g16da57c
Applied
#3 lore raw

PATCH 1/1 ARM: davinci: cp_intc: use IRQCHIP_SKIP_SET_WAKE instead of irq_set_wake callback

Quoted 9 lines · Sekhar Nori

From: Sudeep Holla <[email protected]>

Commit 60f96b41f71d ("genirq: Add IRQCHIP_SKIP_SET_WAKE flag") introduced a new flag to skip the irq_set_wake callback in the irqchip core to avoid adding dummy irq_set_wake in the irqchip implementations.

This patch removes the dummy callback and sets the IRQCHIP_SKIP_SET_WAKE flags.

Quoted 8 lines
Cc Sekhar Nori <[email protected]>
Cc Kevin Hilman <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
Signed-off-by Sekhar Nori <[email protected]>

---
ARM-SoC, can you please apply this patch directly? I do not have any other patches queued, so not sending a pull request.

Merged, thanks.

-Olof