Merge branch 'topic/fsl' into for-linus (b30e70e6) · Commits · 戴 / test

drivers/dma/fsldma.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1328,8 +1328,7 @@ static int fsldma_of_remove(struct platform_device *op)
		#ifdef CONFIG_PM
		static int fsldma_suspend_late(struct device *dev)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct fsldma_device *fdev = platform_get_drvdata(pdev);
		struct fsldma_device *fdev = dev_get_drvdata(dev);
		struct fsldma_chan *chan;
		int i;

		@@ -1360,8 +1359,7 @@ out:

		static int fsldma_resume_early(struct device *dev)
		{
		struct platform_device *pdev = to_platform_device(dev);
		struct fsldma_device *fdev = platform_get_drvdata(pdev);
		struct fsldma_device *fdev = dev_get_drvdata(dev);
		struct fsldma_chan *chan;
		u32 mode;
		int i;