mfd: max8925: Fix onkey driver irq base

update onkey driver's irq base, it should get from max8925,
but not save in a private value

Signed-off-by: Qing Xu <qingx@marvell.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/input/misc/max8925_onkey.c b/drivers/input/misc/max8925_onkey.c
index 369a39de4ff32100ea8dd9847ceb22e37191caf3..f9179b2585a90e5b80f0715da13dbfefdec1cece 100644 (file)
--- a/drivers/input/misc/max8925_onkey.c
+++ b/drivers/input/misc/max8925_onkey.c
@@ -100,9 +100,6 @@ static int max8925_onkey_probe(struct platform_device *pdev)
        input->dev.parent = &pdev->dev;
        input_set_capability(input, EV_KEY, KEY_POWER);
 
-       irq[0] += chip->irq_base;
-       irq[1] += chip->irq_base;
-
        error = request_threaded_irq(irq[0], NULL, max8925_onkey_handler,
                                     IRQF_ONESHOT, "onkey-down", info);
        if (error < 0) {

diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index d7abbb354acdc96fda531222c94728256a4bbeb3..f0cc40296d8ccc50fab35f0805023bdab6ebc54f 100644 (file)
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -867,7 +867,7 @@ int max8925_device_init(struct max8925_chip *chip,
 
        ret = mfd_add_devices(chip->dev, 0, &onkey_devs[0],
                              ARRAY_SIZE(onkey_devs),
-                             NULL, 0, NULL);
+                             NULL, chip->irq_base, NULL);
        if (ret < 0) {
                dev_err(chip->dev, "Failed to add onkey subdev\n");
                goto out_dev;