[02/07] dma: rework dw_dmac suspend_late()/resume_early()

Commit Message

Magnus Damm June 5, 2009, 7:54 a.m. UTC

From: Magnus Damm <[e-mail]>

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 <[e-mail]>
---

 Untested and not test compiled due to lack of cross compiler.

 drivers/dma/dw_dmac.c |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Haavard Skinnemoen June 5, 2009, 8:18 a.m. UTC | #1

Magnus Damm wrote:
> +static struct dev_pm_ops dw_dev_pm_ops = {
> +	.suspend_noirq = dw_suspend_noirq,
> +	.resume_noirq = dw_resume_noirq,
> +};

Can this be const?

Haavard
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Magnus Damm June 5, 2009, 8:34 a.m. UTC | #2

On Fri, Jun 5, 2009 at 5:18 PM, Haavard
Skinnemoen<[e-mail]> wrote:
> Magnus Damm wrote:
>> +static struct dev_pm_ops dw_dev_pm_ops = {
>> +     .suspend_noirq = dw_suspend_noirq,
>> +     .resume_noirq = dw_resume_noirq,
>> +};
>
> Can this be const?

Hm, adding const generates a warning for me. At on SuperH with
gcc-4.3.3 (Sourcery G++ Lite 4.3-143):

[modified dev_pm_ops to const in sh_keysc.c]

  CC      drivers/input/keyboard/sh_keysc.o
drivers/input/keyboard/sh_keysc.c:299: warning: initialization
discards qualifiers from pointer target type

/ magnus
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Haavard Skinnemoen June 5, 2009, 8:45 a.m. UTC | #3

Magnus Damm wrote:
> On Fri, Jun 5, 2009 at 5:18 PM, Haavard
> Skinnemoen<[e-mail]> wrote:
> > Magnus Damm wrote:
> >> +static struct dev_pm_ops dw_dev_pm_ops = {
> >> +     .suspend_noirq = dw_suspend_noirq,
> >> +     .resume_noirq = dw_resume_noirq,
> >> +};
> >
> > Can this be const?
> 
> Hm, adding const generates a warning for me. At on SuperH with
> gcc-4.3.3 (Sourcery G++ Lite 4.3-143):
> 
> [modified dev_pm_ops to const in sh_keysc.c]
> 
>   CC      drivers/input/keyboard/sh_keysc.o
> drivers/input/keyboard/sh_keysc.c:299: warning: initialization
> discards qualifiers from pointer target type

Ok, it looks like the .pm field in struct device_driver is not const.
Changing that will introduce lots of warnings elsewhere, so it's
probably better to leave it alone.

So I guess the answer is no, it can't be const.

Haavard
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- 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,
 	},
 };