Merge branch 'topic/fsl' into for-linus

b30e70e6 · Vinod Koul · 17d5159f · 03bf2793 · b30e70e6
Commit b30e70e6 authored 6 years ago by Vinod Koul
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

drivers/dma/fsldma.c drivers/dma/fsldma.c +2 -4

No files found.
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -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 @@ static int fsldma_suspend_late(struct device *dev)

 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;