[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090624092324.14276.5263.sendpatchset@rx1.opensource.se>
Date: Wed, 24 Jun 2009 18:23:24 +0900
From: Magnus Damm <magnus.damm@...il.com>
To: linux-kernel@...r.kernel.org
Cc: gregkh@...e.de, pavel@....cz, hskinnemoen@...el.com,
anemo@....ocn.ne.jp, linux-usb@...r.kernel.org,
Magnus Damm <magnus.damm@...il.com>, rjw@...k.pl,
stern@...land.harvard.edu, ben-linux@...ff.org,
linux-pm@...ts.linux-foundation.org, linux-omap@...r.kernel.org,
akpm@...ux-foundation.org, felipe.balbi@...ia.com
Subject: [PATCH 02/07] dma: rework dw_dmac suspend_late()/resume_early()
From: Magnus Damm <damm@...l.co.jp>
This patch reworks platform driver power management code
for dw_dmac from legacy late/early callbacks to dev_pm_ops.
The callbacks are converted for CONFIG_SUSPEND like this:
suspend_late() -> suspend_noirq()
resume_early() -> resume_noirq()
Signed-off-by: Magnus Damm <damm@...l.co.jp>
---
Untested and not test compiled due to lack of cross compiler.
drivers/dma/dw_dmac.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
--- 0001/drivers/dma/dw_dmac.c
+++ work/drivers/dma/dw_dmac.c 2009-06-01 16:31:34.000000000 +0900
@@ -1399,8 +1399,9 @@ static void dw_shutdown(struct platform_
clk_disable(dw->clk);
}
-static int dw_suspend_late(struct platform_device *pdev, pm_message_t mesg)
+static int dw_suspend_noirq(struct device *dev)
{
+ struct platform_device *pdev = to_platform_device(dev);
struct dw_dma *dw = platform_get_drvdata(pdev);
dw_dma_off(platform_get_drvdata(pdev));
@@ -1408,23 +1409,27 @@ static int dw_suspend_late(struct platfo
return 0;
}
-static int dw_resume_early(struct platform_device *pdev)
+static int dw_resume_noirq(struct device *dev)
{
+ struct platform_device *pdev = to_platform_device(dev);
struct dw_dma *dw = platform_get_drvdata(pdev);
clk_enable(dw->clk);
dma_writel(dw, CFG, DW_CFG_DMA_EN);
return 0;
-
}
+static struct dev_pm_ops dw_dev_pm_ops = {
+ .suspend_noirq = dw_suspend_noirq,
+ .resume_noirq = dw_resume_noirq,
+};
+
static struct platform_driver dw_driver = {
.remove = __exit_p(dw_remove),
.shutdown = dw_shutdown,
- .suspend_late = dw_suspend_late,
- .resume_early = dw_resume_early,
.driver = {
.name = "dw_dmac",
+ .pm = &dw_dev_pm_ops,
},
};
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists