aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-05-23 21:10:13 -0400
committerVinod Koul <vinod.koul@intel.com>2013-07-05 02:10:32 -0400
commitdd3daca162f7411448dd80a8872a002c43cfd8e5 (patch)
tree7290eeccd9b925353cba16fe09faf389e099a764 /drivers/dma
parentd48de6f1a81b3d10de0f5765aff1b3bd788617b0 (diff)
dma: use platform_{get,set}_drvdata()
Use the wrapper functions for getting and setting the driver data using platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev, so we can directly pass a struct platform_device. Also, unnecessary dev_set_drvdata() is removed, because the driver core clears the driver data to NULL after device_release or on probe failure. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/fsldma.c5
-rw-r--r--drivers/dma/ppc4xx/adma.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 4fc2980556ad..49e8fbdb8983 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -1368,7 +1368,7 @@ static int fsldma_of_probe(struct platform_device *op)
1368 1368
1369 dma_set_mask(&(op->dev), DMA_BIT_MASK(36)); 1369 dma_set_mask(&(op->dev), DMA_BIT_MASK(36));
1370 1370
1371 dev_set_drvdata(&op->dev, fdev); 1371 platform_set_drvdata(op, fdev);
1372 1372
1373 /* 1373 /*
1374 * We cannot use of_platform_bus_probe() because there is no 1374 * We cannot use of_platform_bus_probe() because there is no
@@ -1417,7 +1417,7 @@ static int fsldma_of_remove(struct platform_device *op)
1417 struct fsldma_device *fdev; 1417 struct fsldma_device *fdev;
1418 unsigned int i; 1418 unsigned int i;
1419 1419
1420 fdev = dev_get_drvdata(&op->dev); 1420 fdev = platform_get_drvdata(op);
1421 dma_async_device_unregister(&fdev->common); 1421 dma_async_device_unregister(&fdev->common);
1422 1422
1423 fsldma_free_irqs(fdev); 1423 fsldma_free_irqs(fdev);
@@ -1428,7 +1428,6 @@ static int fsldma_of_remove(struct platform_device *op)
1428 } 1428 }
1429 1429
1430 iounmap(fdev->regs); 1430 iounmap(fdev->regs);
1431 dev_set_drvdata(&op->dev, NULL);
1432 kfree(fdev); 1431 kfree(fdev);
1433 1432
1434 return 0; 1433 return 0;
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index 5d3d95569a1e..e68c51d13cb1 100644
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
@@ -4481,7 +4481,7 @@ static int ppc440spe_adma_probe(struct platform_device *ofdev)
4481 adev->dev = &ofdev->dev; 4481 adev->dev = &ofdev->dev;
4482 adev->common.dev = &ofdev->dev; 4482 adev->common.dev = &ofdev->dev;
4483 INIT_LIST_HEAD(&adev->common.channels); 4483 INIT_LIST_HEAD(&adev->common.channels);
4484 dev_set_drvdata(&ofdev->dev, adev); 4484 platform_set_drvdata(ofdev, adev);
4485 4485
4486 /* create a channel */ 4486 /* create a channel */
4487 chan = kzalloc(sizeof(*chan), GFP_KERNEL); 4487 chan = kzalloc(sizeof(*chan), GFP_KERNEL);
@@ -4594,14 +4594,13 @@ out:
4594 */ 4594 */
4595static int ppc440spe_adma_remove(struct platform_device *ofdev) 4595static int ppc440spe_adma_remove(struct platform_device *ofdev)
4596{ 4596{
4597 struct ppc440spe_adma_device *adev = dev_get_drvdata(&ofdev->dev); 4597 struct ppc440spe_adma_device *adev = platform_get_drvdata(ofdev);
4598 struct device_node *np = ofdev->dev.of_node; 4598 struct device_node *np = ofdev->dev.of_node;
4599 struct resource res; 4599 struct resource res;
4600 struct dma_chan *chan, *_chan; 4600 struct dma_chan *chan, *_chan;
4601 struct ppc_dma_chan_ref *ref, *_ref; 4601 struct ppc_dma_chan_ref *ref, *_ref;
4602 struct ppc440spe_adma_chan *ppc440spe_chan; 4602 struct ppc440spe_adma_chan *ppc440spe_chan;
4603 4603
4604 dev_set_drvdata(&ofdev->dev, NULL);
4605 if (adev->id < PPC440SPE_ADMA_ENGINES_NUM) 4604 if (adev->id < PPC440SPE_ADMA_ENGINES_NUM)
4606 ppc440spe_adma_devices[adev->id] = -1; 4605 ppc440spe_adma_devices[adev->id] = -1;
4607 4606