Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jingoo Han and committed by
Vinod Koul
dd3daca1 d48de6f1

+4 -6
+2 -3
drivers/dma/fsldma.c
··· 1368 1368 1369 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 1374 * We cannot use of_platform_bus_probe() because there is no ··· 1417 1417 struct fsldma_device *fdev; 1418 1418 unsigned int i; 1419 1419 1420 - fdev = dev_get_drvdata(&op->dev); 1420 + fdev = platform_get_drvdata(op); 1421 1421 dma_async_device_unregister(&fdev->common); 1422 1422 1423 1423 fsldma_free_irqs(fdev); ··· 1428 1428 } 1429 1429 1430 1430 iounmap(fdev->regs); 1431 - dev_set_drvdata(&op->dev, NULL); 1432 1431 kfree(fdev); 1433 1432 1434 1433 return 0;
+2 -3
drivers/dma/ppc4xx/adma.c
··· 4481 4481 adev->dev = &ofdev->dev; 4482 4482 adev->common.dev = &ofdev->dev; 4483 4483 INIT_LIST_HEAD(&adev->common.channels); 4484 - dev_set_drvdata(&ofdev->dev, adev); 4484 + platform_set_drvdata(ofdev, adev); 4485 4485 4486 4486 /* create a channel */ 4487 4487 chan = kzalloc(sizeof(*chan), GFP_KERNEL); ··· 4594 4594 */ 4595 4595 static 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 4598 struct device_node *np = ofdev->dev.of_node; 4599 4599 struct resource res; 4600 4600 struct dma_chan *chan, *_chan; 4601 4601 struct ppc_dma_chan_ref *ref, *_ref; 4602 4602 struct ppc440spe_adma_chan *ppc440spe_chan; 4603 4603 4604 - dev_set_drvdata(&ofdev->dev, NULL); 4605 4604 if (adev->id < PPC440SPE_ADMA_ENGINES_NUM) 4606 4605 ppc440spe_adma_devices[adev->id] = -1; 4607 4606