Merge branch 'topic/at' into for-linus (d9a3255f) · Commits · 戴 / test

drivers/dma/at_hdmac.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -2041,8 +2041,7 @@ static void at_dma_shutdown(struct platform_device *pdev)

		static int at_dma_prepare(struct device *dev)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct at_dma *atdma = platform_get_drvdata(pdev);
		struct at_dma *atdma = dev_get_drvdata(dev);
		struct dma_chan chan, _chan;

		list_for_each_entry_safe(chan, _chan, &atdma->dma_common.channels,
		@@ -2076,8 +2075,7 @@ static void atc_suspend_cyclic(struct at_dma_chan *atchan)

		static int at_dma_suspend_noirq(struct device *dev)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct at_dma *atdma = platform_get_drvdata(pdev);
		struct at_dma *atdma = dev_get_drvdata(dev);
		struct dma_chan chan, _chan;

		/* preserve data */
		@@ -2118,8 +2116,7 @@ static void atc_resume_cyclic(struct at_dma_chan *atchan)

		static int at_dma_resume_noirq(struct device *dev)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct at_dma *atdma = platform_get_drvdata(pdev);
		struct at_dma *atdma = dev_get_drvdata(dev);
		struct dma_chan chan, _chan;

		/* bring back DMA controller */

+3 −6

Original line number	Diff line number	Diff line
		@@ -1833,8 +1833,7 @@ static void at_xdmac_free_chan_resources(struct dma_chan *chan)
		#ifdef CONFIG_PM
		static int atmel_xdmac_prepare(struct device *dev)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct at_xdmac *atxdmac = platform_get_drvdata(pdev);
		struct at_xdmac *atxdmac = dev_get_drvdata(dev);
		struct dma_chan chan, _chan;

		list_for_each_entry_safe(chan, _chan, &atxdmac->dma.channels, device_node) {
		@@ -1853,8 +1852,7 @@ static int atmel_xdmac_prepare(struct device *dev)
		#ifdef CONFIG_PM_SLEEP
		static int atmel_xdmac_suspend(struct device *dev)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct at_xdmac *atxdmac = platform_get_drvdata(pdev);
		struct at_xdmac *atxdmac = dev_get_drvdata(dev);
		struct dma_chan chan, _chan;

		list_for_each_entry_safe(chan, _chan, &atxdmac->dma.channels, device_node) {
		@@ -1878,8 +1876,7 @@ static int atmel_xdmac_suspend(struct device *dev)

		static int atmel_xdmac_resume(struct device *dev)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct at_xdmac *atxdmac = platform_get_drvdata(pdev);
		struct at_xdmac *atxdmac = dev_get_drvdata(dev);
		struct at_xdmac_chan *atchan;
		struct dma_chan chan, _chan;
		int i;