Skip to contentSkip to conversation

pm8921 driver cleanup

PATCH Applied Stephen Boyd 2 participants 5 messages Mar 4, 2014 – Mar 5, 2014

Subsystems (2)
Arm Qualcomm mailing list Multifunction devices (MFD)
lore
Share & tools
lore

Stephen Boyd

author
#0 lore raw

cover pm8921 driver cleanup

Two small cleanup patches for the pm8921 core driver.

Stephen Boyd (2):
mfd: pm8921: Drop irq_set_lockdep_class() code
mfd: pm8921: Use IRQCHIP_SKIP_SET_WAKE

 drivers/mfd/pm8921-core.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
author
#1 lore raw

PATCH 1/2 mfd: pm8921: Drop irq_set_lockdep_class() code

This isn't necessary as we aren't setting the summary interrupt to wake up the system in the irq_wake() callback.

Signed-off-by Stephen Boyd <[email protected]>
---
 drivers/mfd/pm8921-core.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/mfd/pm8921-core.c +0 -3
index f7341114f35f..3ebbdf6c61db 100644
@@ -254,14 +254,11 @@ static struct irq_chip pm8xxx_irq_chip = {
 	.flags		= IRQCHIP_MASK_ON_SUSPEND,
 };
 
-static struct lock_class_key pm8xxx_irq_lock_class;
-
 static int pm8xxx_irq_domain_map(struct irq_domain *d, unsigned int irq,
 				   irq_hw_number_t hwirq)
 {
 	struct pm_irq_chip *chip = d->host_data;
 
-	irq_set_lockdep_class(irq, &pm8xxx_irq_lock_class);
 	irq_set_chip_and_handler(irq, &pm8xxx_irq_chip, handle_level_irq);
 	irq_set_chip_data(irq, chip);
 #ifdef CONFIG_ARM
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
author
#3 lore raw

PATCH 2/2 mfd: pm8921: Use IRQCHIP_SKIP_SET_WAKE

In reply to Stephen Boyd

We don't need to implement a dummy irq_set_wake op if we just set IRQCHIP_SKIP_SET_WAKE.

Suggested-by Josh Cartwright <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
---
 drivers/mfd/pm8921-core.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/mfd/pm8921-core.c +1 -7
index 3ebbdf6c61db..3493cd6e973b 100644
@@ -240,18 +240,12 @@ static int pm8xxx_irq_set_type(struct irq_data *d, unsigned int flow_type)
 	return pm8xxx_config_irq(chip, block, config);
 }
 
-static int pm8xxx_irq_set_wake(struct irq_data *d, unsigned int on)
-{
-	return 0;
-}
-
 static struct irq_chip pm8xxx_irq_chip = {
 	.name		= "pm8xxx",
 	.irq_mask_ack	= pm8xxx_irq_mask_ack,
 	.irq_unmask	= pm8xxx_irq_unmask,
 	.irq_set_type	= pm8xxx_irq_set_type,
-	.irq_set_wake	= pm8xxx_irq_set_wake,
-	.flags		= IRQCHIP_MASK_ON_SUSPEND,
+	.flags		= IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE,
 };
 
 static int pm8xxx_irq_domain_map(struct irq_domain *d, unsigned int irq,
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
Applied
#2 lore raw

Re: [PATCH 1/2] mfd: pm8921: Drop irq_set_lockdep_class() code

In reply to Stephen Boyd
Quoted 7 lines

This isn't necessary as we aren't setting the summary interrupt to wake up the system in the irq_wake() callback.

Signed-off-by Stephen Boyd <[email protected]>
---
 drivers/mfd/pm8921-core.c | 3 ---
 1 file changed, 3 deletions(-)

Applied, thanks.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Applied
#4 lore raw

Re: [PATCH 2/2] mfd: pm8921: Use IRQCHIP_SKIP_SET_WAKE

In reply to Stephen Boyd
Quoted 8 lines

We don't need to implement a dummy irq_set_wake op if we just set IRQCHIP_SKIP_SET_WAKE.

Suggested-by Josh Cartwright <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
---
 drivers/mfd/pm8921-core.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

Applied, thanks.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog