summaryrefslogtreecommitdiff
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2018-06-04 07:59:22 +0300
committerVinod Koul <vkoul@kernel.org>2018-06-04 07:59:22 +0300
commit67f31971e7c221c1aff7bc023a724ae284c01a14 (patch)
treecc55393cf52bade35fe83ae20d009c4fd5201363 /drivers/dma
parentf1e3b4ce3a6d786abd73efc418658d61a0c45962 (diff)
parenta8afcfeb013f95a3339eafd690f41af6657a6113 (diff)
downloadlinux-67f31971e7c221c1aff7bc023a724ae284c01a14.tar.xz
Merge branch 'topic/txx' into for-linus
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/txx9dmac.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c
index 4d8c7b9078fd..eb45af71d3a3 100644
--- 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;