[PATCH 2/2] pinctrl: single: remove misuse of IRQF_NO_SUSPEND flag
From: Sudeep Holla
Date: Fri Nov 27 2015 - 12:21:29 EST
From: Sudeep Holla <Sudeep.Holla@xxxxxxx>
The IRQF_NO_SUSPEND flag is used to identify the interrupts that should
be left enabled so as to allow them to work as expected during the
suspend-resume cycle, but doesn't guarantee that it will wake the system
from a suspended state, enable_irq_wake is recommended to be used for
the wakeup.
This patch removes the use of IRQF_NO_SUSPEND flags replacing it with
irq_set_irq_wake instead.
Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
Cc: linux-gpio@xxxxxxxxxxxxxxx
Signed-off-by: Sudeep Holla <sudeep.holla@xxxxxxx>
---
drivers/pinctrl/pinctrl-single.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 945a7d0f0704..a1e32c6b554a 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -1622,12 +1622,14 @@ static void pcs_irq_unmask(struct irq_data *d)
*/
static int pcs_irq_set_wake(struct irq_data *d, unsigned int state)
{
+ struct pcs_soc_data *pcs_soc = irq_data_get_irq_chip_data(d);
+
if (state)
pcs_irq_unmask(d);
else
pcs_irq_mask(d);
- return 0;
+ return irq_set_irq_wake(pcs_soc->irq, state);
}
/**
@@ -1763,8 +1765,7 @@ static int pcs_irq_init_chained_handler(struct pcs_device *pcs,
int res;
res = request_irq(pcs_soc->irq, pcs_irq_handler,
- IRQF_SHARED | IRQF_NO_SUSPEND |
- IRQF_NO_THREAD,
+ IRQF_SHARED | IRQF_NO_THREAD,
name, pcs_soc);
if (res) {
pcs_soc->irq = -1;
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/