2019-03-27 06:20:36

by Anson Huang

Subject: [PATCH] rtc: snvs: use dev_pm_set_wake_irq() to simplify code

With calling dev_pm_set_wake_irq() to set SNVS RTC as wakeup
source for suspend, generic wake irq mechanism will automatically
enable it as wakeup source when suspend, then the suspend/resume
callback which are ONLY for enabling/disabling irq wake can be
removed, it simplifies the code.

Signed-off-by: Anson Huang <[email protected]>
---
drivers/rtc/rtc-snvs.c | 25 ++++---------------------
1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/drivers/rtc/rtc-snvs.c b/drivers/rtc/rtc-snvs.c
index 0b9eff1..ce73eab 100644
--- a/drivers/rtc/rtc-snvs.c
+++ b/drivers/rtc/rtc-snvs.c
@@ -9,6 +9,7 @@
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
+#include <linux/pm_wakeirq.h>
#include <linux/rtc.h>
#include <linux/clk.h>
#include <linux/mfd/syscon.h>
@@ -332,6 +333,9 @@ static int snvs_rtc_probe(struct platform_device *pdev)
}

device_init_wakeup(&pdev->dev, true);
+ ret = dev_pm_set_wake_irq(&pdev->dev, data->irq);
+ if (ret)
+ dev_err(&pdev->dev, "failed to enable irq wake\n");

ret = devm_request_irq(&pdev->dev, data->irq, snvs_rtc_irq_handler,
IRQF_SHARED, "rtc alarm", &pdev->dev);
@@ -359,15 +363,6 @@ static int snvs_rtc_probe(struct platform_device *pdev)
}

#ifdef CONFIG_PM_SLEEP
-static int snvs_rtc_suspend(struct device *dev)
-{
- struct snvs_rtc_data *data = dev_get_drvdata(dev);
-
- if (device_may_wakeup(dev))
- return enable_irq_wake(data->irq);
-
- return 0;
-}

static int snvs_rtc_suspend_noirq(struct device *dev)
{
@@ -379,16 +374,6 @@ static int snvs_rtc_suspend_noirq(struct device *dev)
return 0;
}

-static int snvs_rtc_resume(struct device *dev)
-{
- struct snvs_rtc_data *data = dev_get_drvdata(dev);
-
- if (device_may_wakeup(dev))
- return disable_irq_wake(data->irq);
-
- return 0;
-}
-
static int snvs_rtc_resume_noirq(struct device *dev)
{
struct snvs_rtc_data *data = dev_get_drvdata(dev);
@@ -400,9 +385,7 @@ static int snvs_rtc_resume_noirq(struct device *dev)
}

static const struct dev_pm_ops snvs_rtc_pm_ops = {
- .suspend = snvs_rtc_suspend,
.suspend_noirq = snvs_rtc_suspend_noirq,
- .resume = snvs_rtc_resume,
.resume_noirq = snvs_rtc_resume_noirq,
};

--
2.7.4

2019-04-01 15:29:51

by Alexandre Belloni

Subject: Re: [PATCH] rtc: snvs: use dev_pm_set_wake_irq() to simplify code

On 27/03/2019 06:18:20+0000, Anson Huang wrote:
> With calling dev_pm_set_wake_irq() to set SNVS RTC as wakeup
> source for suspend, generic wake irq mechanism will automatically
> enable it as wakeup source when suspend, then the suspend/resume
> callback which are ONLY for enabling/disabling irq wake can be
> removed, it simplifies the code.
>
> Signed-off-by: Anson Huang <[email protected]>
> ---
> drivers/rtc/rtc-snvs.c | 25 ++++---------------------
> 1 file changed, 4 insertions(+), 21 deletions(-)
>
Applied, thanks.

--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com