Commit 53cf4c9b authored by Vinod Koul's avatar Vinod Koul

Merge branch 'topic/idma' into for-linus

parents b30e70e6 b7d69799
...@@ -670,8 +670,7 @@ static int idma64_platform_remove(struct platform_device *pdev) ...@@ -670,8 +670,7 @@ static int idma64_platform_remove(struct platform_device *pdev)
static int idma64_pm_suspend(struct device *dev) static int idma64_pm_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct idma64_chip *chip = dev_get_drvdata(dev);
struct idma64_chip *chip = platform_get_drvdata(pdev);
idma64_off(chip->idma64); idma64_off(chip->idma64);
return 0; return 0;
...@@ -679,8 +678,7 @@ static int idma64_pm_suspend(struct device *dev) ...@@ -679,8 +678,7 @@ static int idma64_pm_suspend(struct device *dev)
static int idma64_pm_resume(struct device *dev) static int idma64_pm_resume(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct idma64_chip *chip = dev_get_drvdata(dev);
struct idma64_chip *chip = platform_get_drvdata(pdev);
idma64_on(chip->idma64); idma64_on(chip->idma64);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment