diff options
| author | Vinod Koul <vkoul@kernel.org> | 2018-06-04 00:58:13 -0400 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2018-06-04 00:58:13 -0400 |
| commit | 17d5159f411bb86892fd2055b578d8e240dd7bbc (patch) | |
| tree | 1f65ac12767da322a227765df8f143b6047b9f2b | |
| parent | 34cc234ffaf1e1ef8bf09c7a7e5426a50522bca6 (diff) | |
| parent | 83ff13235fb3e9c10401f457df27f67bf3b389af (diff) | |
Merge branch 'topic/dw' into for-linus
| -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); | |||
| 293 | 293 | ||
| 294 | static int dw_suspend_late(struct device *dev) | 294 | static int dw_suspend_late(struct device *dev) |
| 295 | { | 295 | { |
| 296 | struct platform_device *pdev = to_platform_device(dev); | 296 | struct dw_dma_chip *chip = dev_get_drvdata(dev); |
| 297 | struct dw_dma_chip *chip = platform_get_drvdata(pdev); | ||
| 298 | 297 | ||
| 299 | dw_dma_disable(chip); | 298 | dw_dma_disable(chip); |
| 300 | clk_disable_unprepare(chip->clk); | 299 | clk_disable_unprepare(chip->clk); |
| @@ -304,8 +303,7 @@ static int dw_suspend_late(struct device *dev) | |||
| 304 | 303 | ||
| 305 | static int dw_resume_early(struct device *dev) | 304 | static int dw_resume_early(struct device *dev) |
| 306 | { | 305 | { |
| 307 | struct platform_device *pdev = to_platform_device(dev); | 306 | struct dw_dma_chip *chip = dev_get_drvdata(dev); |
| 308 | struct dw_dma_chip *chip = platform_get_drvdata(pdev); | ||
| 309 | int ret; | 307 | int ret; |
| 310 | 308 | ||
| 311 | ret = clk_prepare_enable(chip->clk); | 309 | ret = clk_prepare_enable(chip->clk); |