Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 067bd4fd authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

dmaengine: dw: move PM to suspend_late / resume_early stages 

There is no need to use *_noirq version of suspend and resume PM callbacks. The
suspend_late / resume_early suit better (it was discussed in [1]) and in future
could be used for runtime PM support.

[1] http://www.spinics.net/lists/kernel/msg1650974.html



Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent baca66f7

drivers/dma/dw/platform.c

+4 −14
Original line number Original line Diff line number Diff line
@@ -256,7 +256,7 @@ MODULE_DEVICE_TABLE(acpi, dw_dma_acpi_id_table); 




#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_PM_SLEEP





static int dw_suspend_noirq(struct device *dev)

static int dw_suspend_late(struct device *dev)

{

{

	struct platform_device *pdev = to_platform_device(dev);

	struct platform_device *pdev = to_platform_device(dev);

	struct dw_dma_chip *chip = platform_get_drvdata(pdev);

	struct dw_dma_chip *chip = platform_get_drvdata(pdev);
@@ -264,7 +264,7 @@ static int dw_suspend_noirq(struct device *dev) 
	return dw_dma_suspend(chip);

	return dw_dma_suspend(chip);

}

}





static int dw_resume_noirq(struct device *dev)

static int dw_resume_early(struct device *dev)

{

{

	struct platform_device *pdev = to_platform_device(dev);

	struct platform_device *pdev = to_platform_device(dev);

	struct dw_dma_chip *chip = platform_get_drvdata(pdev);

	struct dw_dma_chip *chip = platform_get_drvdata(pdev);
@@ -272,20 +272,10 @@ static int dw_resume_noirq(struct device *dev) 
	return dw_dma_resume(chip);

	return dw_dma_resume(chip);

}

}





#else /* !CONFIG_PM_SLEEP */

#endif /* CONFIG_PM_SLEEP */



#define dw_suspend_noirq	NULL

#define dw_resume_noirq		NULL



#endif /* !CONFIG_PM_SLEEP */





static const struct dev_pm_ops dw_dev_pm_ops = {

static const struct dev_pm_ops dw_dev_pm_ops = {

	.suspend_noirq = dw_suspend_noirq,

	SET_LATE_SYSTEM_SLEEP_PM_OPS(dw_suspend_late, dw_resume_early)

	.resume_noirq = dw_resume_noirq,

	.freeze_noirq = dw_suspend_noirq,

	.thaw_noirq = dw_resume_noirq,

	.restore_noirq = dw_resume_noirq,

	.poweroff_noirq = dw_suspend_noirq,

};

};





static struct platform_driver dw_driver = {

static struct platform_driver dw_driver = {