[PATCH 3/7] mfd: max8925: fix onkey driver irq base

Dmitry Torokhov dmitry.torokhov at gmail.com
Fri Nov 23 18:41:58 EST 2012


Hi Qing,

On Fri, Nov 23, 2012 at 03:20:11PM +0800, Qing Xu wrote:
> On 11/06/2012 03:39 PM, Qing Xu wrote:
> >From: Qing Xu <qingx at marvell.com>
> >
> >update onkey driver's irq base, it should get from max8925,
> >but not save in a private value
> >
> >Signed-off-by: Qing Xu <qingx at marvell.com>
> >---
> >  drivers/input/misc/max8925_onkey.c |    3 ---
> >  drivers/mfd/max8925-core.c         |    2 +-
> >  2 files changed, 1 insertions(+), 4 deletions(-)
> >
> >diff --git a/drivers/input/misc/max8925_onkey.c b/drivers/input/misc/max8925_onkey.c
> >index 0a12b74..6527789 100644
> >--- a/drivers/input/misc/max8925_onkey.c
> >+++ b/drivers/input/misc/max8925_onkey.c
> >@@ -100,9 +100,6 @@ static int __devinit 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 b1eacae..37a372d 100644
> >--- a/drivers/mfd/max8925-core.c
> >+++ b/drivers/mfd/max8925-core.c
> >@@ -881,7 +881,7 @@ int __devinit 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;
> Hi Dmitry,
> 
> Could you help to review my patch? Thanks a lot!
> 

Looks good to me.

Acked-by: Dmitry Torokhov <dmitry.torokhov at gmail.com>

Thanks.

-- 
Dmitry


More information about the devicetree-discuss mailing list