Merge branch 'topic/txx' into for-linus

67f31971 · Vinod Koul · f1e3b4ce · a8afcfeb · 67f31971
Commit 67f31971 authored Jun 04, 2018 by Vinod Koul
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

drivers/dma/txx9dmac.c drivers/dma/txx9dmac.c +3 -5

No files found.
--- a/drivers/dma/txx9dmac.c
+++ b/drivers/dma/txx9dmac.c
@@ -1244,8 +1244,7 @@ static void txx9dmac_shutdown(struct platform_device *pdev)

 static int txx9dmac_suspend_noirq(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct txx9dmac_dev *ddev = platform_get_drvdata(pdev);
+	struct txx9dmac_dev *ddev = dev_get_drvdata(dev);

 	txx9dmac_off(ddev);
 	return 0;
@@ -1253,9 +1252,8 @@ static int txx9dmac_suspend_noirq(struct device *dev)

 static int txx9dmac_resume_noirq(struct device *dev)
 {
-	struct platform_device *pdev = to_platform_device(dev);
-	struct txx9dmac_dev *ddev = platform_get_drvdata(pdev);
-	struct txx9dmac_platform_data *pdata = dev_get_platdata(&pdev->dev);
+	struct txx9dmac_dev *ddev = dev_get_drvdata(dev);
+	struct txx9dmac_platform_data *pdata = dev_get_platdata(dev);
 	u32 mcr;

 	mcr = TXX9_DMA_MCR_MSTEN | MCR_LE;