* [PATCH 0/2] pm8921 driver cleanup
@ 2014-03-04 18:48 ` Stephen Boyd
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2014-03-04 18:48 UTC (permalink / raw)
To: linux-arm-kernel
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(-)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/2] mfd: pm8921: Drop irq_set_lockdep_class() code
2014-03-04 18:48 ` Stephen Boyd
@ 2014-03-04 18:48 ` Stephen Boyd
-1 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2014-03-04 18:48 UTC (permalink / raw)
To: Lee Jones
Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, Samuel Ortiz,
Josh Cartwright
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 <sboyd@codeaurora.org>
---
drivers/mfd/pm8921-core.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index f7341114f35f..3ebbdf6c61db 100644
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -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
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 1/2] mfd: pm8921: Drop irq_set_lockdep_class() code
@ 2014-03-04 18:48 ` Stephen Boyd
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2014-03-04 18:48 UTC (permalink / raw)
To: linux-arm-kernel
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 <sboyd@codeaurora.org>
---
drivers/mfd/pm8921-core.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index f7341114f35f..3ebbdf6c61db 100644
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -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
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 1/2] mfd: pm8921: Drop irq_set_lockdep_class() code
2014-03-04 18:48 ` Stephen Boyd
@ 2014-03-05 1:50 ` Lee Jones
-1 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2014-03-05 1:50 UTC (permalink / raw)
To: Stephen Boyd
Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, Samuel Ortiz,
Josh Cartwright
> 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 <sboyd@codeaurora.org>
> ---
> drivers/mfd/pm8921-core.c | 3 ---
> 1 file changed, 3 deletions(-)
Applied, thanks.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/2] mfd: pm8921: Drop irq_set_lockdep_class() code
@ 2014-03-05 1:50 ` Lee Jones
0 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2014-03-05 1:50 UTC (permalink / raw)
To: linux-arm-kernel
> 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 <sboyd@codeaurora.org>
> ---
> drivers/mfd/pm8921-core.c | 3 ---
> 1 file changed, 3 deletions(-)
Applied, thanks.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/2] mfd: pm8921: Use IRQCHIP_SKIP_SET_WAKE
2014-03-04 18:48 ` Stephen Boyd
@ 2014-03-04 18:48 ` Stephen Boyd
-1 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2014-03-04 18:48 UTC (permalink / raw)
To: Lee Jones
Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, Samuel Ortiz,
Josh Cartwright
We don't need to implement a dummy irq_set_wake op if we just set
IRQCHIP_SKIP_SET_WAKE.
Suggested-by: Josh Cartwright <joshc@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/mfd/pm8921-core.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index 3ebbdf6c61db..3493cd6e973b 100644
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -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,
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/2] mfd: pm8921: Use IRQCHIP_SKIP_SET_WAKE
@ 2014-03-04 18:48 ` Stephen Boyd
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2014-03-04 18:48 UTC (permalink / raw)
To: linux-arm-kernel
We don't need to implement a dummy irq_set_wake op if we just set
IRQCHIP_SKIP_SET_WAKE.
Suggested-by: Josh Cartwright <joshc@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/mfd/pm8921-core.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index 3ebbdf6c61db..3493cd6e973b 100644
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -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,
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 2/2] mfd: pm8921: Use IRQCHIP_SKIP_SET_WAKE
2014-03-04 18:48 ` Stephen Boyd
@ 2014-03-05 1:50 ` Lee Jones
-1 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2014-03-05 1:50 UTC (permalink / raw)
To: Stephen Boyd
Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, Samuel Ortiz,
Josh Cartwright
> We don't need to implement a dummy irq_set_wake op if we just set
> IRQCHIP_SKIP_SET_WAKE.
>
> Suggested-by: Josh Cartwright <joshc@codeaurora.org>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
> drivers/mfd/pm8921-core.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
Applied, thanks.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/2] mfd: pm8921: Use IRQCHIP_SKIP_SET_WAKE
@ 2014-03-05 1:50 ` Lee Jones
0 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2014-03-05 1:50 UTC (permalink / raw)
To: linux-arm-kernel
> We don't need to implement a dummy irq_set_wake op if we just set
> IRQCHIP_SKIP_SET_WAKE.
>
> Suggested-by: Josh Cartwright <joshc@codeaurora.org>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
> drivers/mfd/pm8921-core.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
Applied, thanks.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 10+ messages in thread