diff options
| author | Vinod Koul <vkoul@kernel.org> | 2018-06-04 10:28:21 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2018-06-04 10:28:21 +0530 |
| commit | b30e70e6b4f549ca97762556ca0bc88544154012 (patch) | |
| tree | c91beb668ff408e24a380808fd1ee061e189c5b7 /drivers/dma | |
| parent | 17d5159f411bb86892fd2055b578d8e240dd7bbc (diff) | |
| parent | 03bf2793f3637f7c3cb7acbe40f15f4da333f2e1 (diff) | |
| download | linux-b30e70e6b4f549ca97762556ca0bc88544154012.tar.bz2 | |
Merge branch 'topic/fsl' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/fsldma.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index 3eaece888e75..1117b5123a6f 100644 --- 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 @@ 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; |