* [PATCH 3/7] mfd: max8925: fix onkey driver irq base
@ 2012-11-06 7:39 Qing Xu
2012-11-23 7:20 ` Qing Xu
0 siblings, 1 reply; 3+ messages in thread
From: Qing Xu @ 2012-11-06 7:39 UTC (permalink / raw)
To: qingx, sameo, grant.likely, rob.herring, haojian.zhuang, cxie4,
linux-kernel, devicetree-discuss
From: Qing Xu <qingx@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@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;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 3/7] mfd: max8925: fix onkey driver irq base
2012-11-06 7:39 [PATCH 3/7] mfd: max8925: fix onkey driver irq base Qing Xu
@ 2012-11-23 7:20 ` Qing Xu
2012-11-23 7:41 ` Dmitry Torokhov
0 siblings, 1 reply; 3+ messages in thread
From: Qing Xu @ 2012-11-23 7:20 UTC (permalink / raw)
To: Qing Xu
Cc: Dmitry Torokhov, grant.likely@secretlab.ca,
rob.herring@calxeda.com, haojian.zhuang@gmail.com, Chao Xie,
linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org,
sameo@linux.intel.com
On 11/06/2012 03:39 PM, Qing Xu wrote:
> From: Qing Xu <qingx@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@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!
-Qing
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 3/7] mfd: max8925: fix onkey driver irq base
2012-11-23 7:20 ` Qing Xu
@ 2012-11-23 7:41 ` Dmitry Torokhov
0 siblings, 0 replies; 3+ messages in thread
From: Dmitry Torokhov @ 2012-11-23 7:41 UTC (permalink / raw)
To: Qing Xu
Cc: grant.likely@secretlab.ca, rob.herring@calxeda.com,
haojian.zhuang@gmail.com, Chao Xie, linux-kernel@vger.kernel.org,
devicetree-discuss@lists.ozlabs.org, sameo@linux.intel.com
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@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@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@gmail.com>
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-23 7:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-06 7:39 [PATCH 3/7] mfd: max8925: fix onkey driver irq base Qing Xu
2012-11-23 7:20 ` Qing Xu
2012-11-23 7:41 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).