Merge tag 's390-5.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-2.6-microblaze.git] / drivers / mfd / max8907.c

diff --git a/drivers/mfd/max8907.c b/drivers/mfd/max8907.c
index d44baaf..41f566e 100644 (file)
--- a/drivers/mfd/max8907.c
+++ b/drivers/mfd/max8907.c
@@ -228,11 +228,9 @@ static int max8907_i2c_probe(struct i2c_client *i2c,
                goto err_regmap_rtc;
        }
 
-       irq_set_status_flags(max8907->i2c_gen->irq, IRQ_NOAUTOEN);
-
        ret = regmap_add_irq_chip(max8907->regmap_gen, max8907->i2c_gen->irq,
-                                 IRQF_ONESHOT | IRQF_SHARED, -1,
-                                 &max8907_chg_irq_chip,
+                                 IRQF_ONESHOT | IRQF_SHARED,
+                                 -1, &max8907_chg_irq_chip,
                                  &max8907->irqc_chg);
        if (ret != 0) {
                dev_err(&i2c->dev, "failed to add chg irq chip: %d\n", ret);
@@ -255,8 +253,6 @@ static int max8907_i2c_probe(struct i2c_client *i2c,
                goto err_irqc_rtc;
        }
 
-       enable_irq(max8907->i2c_gen->irq);
-
        ret = mfd_add_devices(max8907->dev, -1, max8907_cells,
                              ARRAY_SIZE(max8907_cells), NULL, 0, NULL);
        if (ret != 0) {