Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / pm8921-core.c

diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index 4d486e91b60227074cea348e8304183d20606338..b97a97187ae992ebe9f1b55cb511636b012fde4c 100644 (file)
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -247,18 +247,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,
 };
 
 /**
@@ -400,9 +394,8 @@ static int pm8921_probe(struct platform_device *pdev)
 {
        struct pm8921 *pmic;
        struct regmap *regmap;
-       int rc;
+       int irq, rc;
        unsigned int val;
-       unsigned int irq;
        u32 rev;
        struct pm_irq_chip *chip;
        unsigned int nirqs = PM8921_NR_IRQS;