diff options
| author | Vinod Koul <vkoul@kernel.org> | 2018-06-04 10:28:13 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2018-06-04 10:28:13 +0530 |
| commit | 17d5159f411bb86892fd2055b578d8e240dd7bbc (patch) | |
| tree | 1f65ac12767da322a227765df8f143b6047b9f2b /drivers/dma | |
| parent | 34cc234ffaf1e1ef8bf09c7a7e5426a50522bca6 (diff) | |
| parent | 83ff13235fb3e9c10401f457df27f67bf3b389af (diff) | |
| download | linux-17d5159f411bb86892fd2055b578d8e240dd7bbc.tar.gz linux-17d5159f411bb86892fd2055b578d8e240dd7bbc.tar.bz2 linux-17d5159f411bb86892fd2055b578d8e240dd7bbc.zip | |
Merge branch 'topic/dw' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/dw/platform.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c index bc31fe802061..f62dd0944908 100644 --- a/drivers/dma/dw/platform.c +++ b/drivers/dma/dw/platform.c @@ -293,8 +293,7 @@ MODULE_DEVICE_TABLE(acpi, dw_dma_acpi_id_table); static int dw_suspend_late(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct dw_dma_chip *chip = platform_get_drvdata(pdev); + struct dw_dma_chip *chip = dev_get_drvdata(dev); dw_dma_disable(chip); clk_disable_unprepare(chip->clk); @@ -304,8 +303,7 @@ static int dw_suspend_late(struct device *dev) static int dw_resume_early(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct dw_dma_chip *chip = platform_get_drvdata(pdev); + struct dw_dma_chip *chip = dev_get_drvdata(dev); int ret; ret = clk_prepare_enable(chip->clk); |