From: Wanlong Gao <gaowanlong@cn.fujitsu.com>
To: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: dmitry.torokhov@gmail.com, dtor@mail.ru,
linux-input@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Kevin Liu <kliu5@marvell.com>
Subject: Re: [PATCH] misc: max8925_onkey: add function to work as wakeup source
Date: Thu, 22 Dec 2011 17:08:04 +0800 [thread overview]
Message-ID: <4EF2F374.1010606@cn.fujitsu.com> (raw)
In-Reply-To: <1324544151-2040-1-git-send-email-haojian.zhuang@marvell.com>
On 12/22/2011 04:55 PM, Haojian Zhuang wrote:
> From: Kevin Liu <kliu5@marvell.com>
>
> Signed-off-by: Kevin Liu <kliu5@marvell.com>
> ---
> drivers/input/misc/max8925_onkey.c | 35 +++++++++++++++++++++++++++++++++++
> 1 files changed, 35 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/input/misc/max8925_onkey.c b/drivers/input/misc/max8925_onkey.c
> index 7de0ded..ce07ae2 100644
> --- a/drivers/input/misc/max8925_onkey.c
> +++ b/drivers/input/misc/max8925_onkey.c
> @@ -122,6 +122,7 @@ static int __devinit max8925_onkey_probe(struct platform_device *pdev)
> info->idev->evbit[0] = BIT_MASK(EV_KEY);
> info->idev->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER);
>
> + device_init_wakeup(&pdev->dev, 1);
>
> error = input_register_device(info->idev);
> if (error) {
> @@ -158,10 +159,44 @@ static int __devexit max8925_onkey_remove(struct platform_device *pdev)
> return 0;
> }
>
> +#ifdef CONFIG_PM
> +static int max8925_onkey_suspend(struct device *dev)
> +{
> + struct platform_device *pdev = to_platform_device(dev);
> + struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
> +
> + if (device_may_wakeup(dev)) {
> + chip->wakeup_flag |= 1 << (onkey_irq[0] - chip->irq_base);
> + chip->wakeup_flag |= 1 << (onkey_irq[1] - chip->irq_base);
> + }
> + return 0;
> +}
> +
> +static int max8925_onkey_resume(struct device *dev)
> +{
> + struct platform_device *pdev = to_platform_device(dev);
> + struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
> +
> + if (device_may_wakeup(dev)) {
> + chip->wakeup_flag &= ~(1 << (onkey_irq[0] - chip->irq_base));
> + chip->wakeup_flag &= ~(1 << (onkey_irq[1] - chip->irq_base));
> + }
> + return 0;
> +}
> +
> +static struct dev_pm_ops max8925_onkey_pm_ops = {
> + .suspend = max8925_onkey_suspend,
> + .resume = max8925_onkey_resume,
> +}
You can use SIMPLE_DEV_PM_OPS here.
Thanks
-Wanlong Gao
> +#endif
> +
> static struct platform_driver max8925_onkey_driver = {
> .driver = {
> .name = "max8925-onkey",
> .owner = THIS_MODULE,
> +#ifdef CONFIG_PM
> + .pm = &max8925_onkey_pm_ops,
> +#endif
> },
> .probe = max8925_onkey_probe,
> .remove = __devexit_p(max8925_onkey_remove),
WARNING: multiple messages have this Message-ID (diff)
From: gaowanlong@cn.fujitsu.com (Wanlong Gao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] misc: max8925_onkey: add function to work as wakeup source
Date: Thu, 22 Dec 2011 17:08:04 +0800 [thread overview]
Message-ID: <4EF2F374.1010606@cn.fujitsu.com> (raw)
In-Reply-To: <1324544151-2040-1-git-send-email-haojian.zhuang@marvell.com>
On 12/22/2011 04:55 PM, Haojian Zhuang wrote:
> From: Kevin Liu <kliu5@marvell.com>
>
> Signed-off-by: Kevin Liu <kliu5@marvell.com>
> ---
> drivers/input/misc/max8925_onkey.c | 35 +++++++++++++++++++++++++++++++++++
> 1 files changed, 35 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/input/misc/max8925_onkey.c b/drivers/input/misc/max8925_onkey.c
> index 7de0ded..ce07ae2 100644
> --- a/drivers/input/misc/max8925_onkey.c
> +++ b/drivers/input/misc/max8925_onkey.c
> @@ -122,6 +122,7 @@ static int __devinit max8925_onkey_probe(struct platform_device *pdev)
> info->idev->evbit[0] = BIT_MASK(EV_KEY);
> info->idev->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER);
>
> + device_init_wakeup(&pdev->dev, 1);
>
> error = input_register_device(info->idev);
> if (error) {
> @@ -158,10 +159,44 @@ static int __devexit max8925_onkey_remove(struct platform_device *pdev)
> return 0;
> }
>
> +#ifdef CONFIG_PM
> +static int max8925_onkey_suspend(struct device *dev)
> +{
> + struct platform_device *pdev = to_platform_device(dev);
> + struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
> +
> + if (device_may_wakeup(dev)) {
> + chip->wakeup_flag |= 1 << (onkey_irq[0] - chip->irq_base);
> + chip->wakeup_flag |= 1 << (onkey_irq[1] - chip->irq_base);
> + }
> + return 0;
> +}
> +
> +static int max8925_onkey_resume(struct device *dev)
> +{
> + struct platform_device *pdev = to_platform_device(dev);
> + struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
> +
> + if (device_may_wakeup(dev)) {
> + chip->wakeup_flag &= ~(1 << (onkey_irq[0] - chip->irq_base));
> + chip->wakeup_flag &= ~(1 << (onkey_irq[1] - chip->irq_base));
> + }
> + return 0;
> +}
> +
> +static struct dev_pm_ops max8925_onkey_pm_ops = {
> + .suspend = max8925_onkey_suspend,
> + .resume = max8925_onkey_resume,
> +}
You can use SIMPLE_DEV_PM_OPS here.
Thanks
-Wanlong Gao
> +#endif
> +
> static struct platform_driver max8925_onkey_driver = {
> .driver = {
> .name = "max8925-onkey",
> .owner = THIS_MODULE,
> +#ifdef CONFIG_PM
> + .pm = &max8925_onkey_pm_ops,
> +#endif
> },
> .probe = max8925_onkey_probe,
> .remove = __devexit_p(max8925_onkey_remove),
next prev parent reply other threads:[~2011-12-22 9:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-22 8:55 [PATCH] misc: max8925_onkey: add function to work as wakeup source Haojian Zhuang
2011-12-22 8:55 ` Haojian Zhuang
2011-12-22 9:08 ` Wanlong Gao [this message]
2011-12-22 9:08 ` Wanlong Gao
2011-12-22 17:43 ` Dmitry Torokhov
2011-12-22 17:43 ` Dmitry Torokhov
2011-12-23 14:43 ` Haojian Zhuang
2011-12-23 14:43 ` Haojian Zhuang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EF2F374.1010606@cn.fujitsu.com \
--to=gaowanlong@cn.fujitsu.com \
--cc=dmitry.torokhov@gmail.com \
--cc=dtor@mail.ru \
--cc=haojian.zhuang@marvell.com \
--cc=kliu5@marvell.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-input@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.