summaryrefslogtreecommitdiff
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2018-06-04 07:58:30 +0300
committerVinod Koul <vkoul@kernel.org>2018-06-04 07:58:30 +0300
commit53cf4c9b02c0a155f385e105b233a4d984e17117 (patch)
tree7f73bd960431a848dcf7d7578bde73a6ca9ac720 /drivers/dma
parentb30e70e6b4f549ca97762556ca0bc88544154012 (diff)
parentb7d69799af675e1c13ea470ef942450216b2c9b6 (diff)
downloadlinux-53cf4c9b02c0a155f385e105b233a4d984e17117.tar.xz
Merge branch 'topic/idma' into for-linus
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/idma64.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c
index 1953e57505f4..e5c911200bdb 100644
--- a/drivers/dma/idma64.c
+++ b/drivers/dma/idma64.c
@@ -670,8 +670,7 @@ static int idma64_platform_remove(struct platform_device *pdev)
static int idma64_pm_suspend(struct device *dev)
{
- struct platform_device *pdev = to_platform_device(dev);
- struct idma64_chip *chip = platform_get_drvdata(pdev);
+ struct idma64_chip *chip = dev_get_drvdata(dev);
idma64_off(chip->idma64);
return 0;
@@ -679,8 +678,7 @@ static int idma64_pm_suspend(struct device *dev)
static int idma64_pm_resume(struct device *dev)
{
- struct platform_device *pdev = to_platform_device(dev);
- struct idma64_chip *chip = platform_get_drvdata(pdev);
+ struct idma64_chip *chip = dev_get_drvdata(dev);
idma64_on(chip->idma64);
return 0;