Merge branch 'topic/idma' into for-linus

53cf4c9b · Vinod Koul · b30e70e6 · b7d69799 · 53cf4c9b
Commit 53cf4c9b authored Jun 04, 2018 by Vinod Koul
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

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

No files found.
--- 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;