* [PATCH] dma: use platform_{get,set}_drvdata()
@ 2013-05-24 1:10 Jingoo Han
2013-05-24 5:14 ` Vinod Koul
0 siblings, 1 reply; 2+ messages in thread
From: Jingoo Han @ 2013-05-24 1:10 UTC (permalink / raw)
To: 'Vinod Koul'
Cc: 'Dan Williams', linux-kernel, Jingoo Han, Li Yang,
'Zhang Wei'
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>
---
drivers/dma/fsldma.c | 5 ++---
drivers/dma/ppc4xx/adma.c | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 4fc2980..49e8fbd 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -1368,7 +1368,7 @@ static int fsldma_of_probe(struct platform_device *op)
dma_set_mask(&(op->dev), DMA_BIT_MASK(36));
- dev_set_drvdata(&op->dev, fdev);
+ platform_set_drvdata(op, fdev);
/*
* We cannot use of_platform_bus_probe() because there is no
@@ -1417,7 +1417,7 @@ static int fsldma_of_remove(struct platform_device *op)
struct fsldma_device *fdev;
unsigned int i;
- fdev = dev_get_drvdata(&op->dev);
+ fdev = platform_get_drvdata(op);
dma_async_device_unregister(&fdev->common);
fsldma_free_irqs(fdev);
@@ -1428,7 +1428,6 @@ static int fsldma_of_remove(struct platform_device *op)
}
iounmap(fdev->regs);
- dev_set_drvdata(&op->dev, NULL);
kfree(fdev);
return 0;
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index 5d3d955..e68c51d 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)
adev->dev = &ofdev->dev;
adev->common.dev = &ofdev->dev;
INIT_LIST_HEAD(&adev->common.channels);
- dev_set_drvdata(&ofdev->dev, adev);
+ platform_set_drvdata(ofdev, adev);
/* create a channel */
chan = kzalloc(sizeof(*chan), GFP_KERNEL);
@@ -4594,14 +4594,13 @@ out:
*/
static int ppc440spe_adma_remove(struct platform_device *ofdev)
{
- struct ppc440spe_adma_device *adev = dev_get_drvdata(&ofdev->dev);
+ struct ppc440spe_adma_device *adev = platform_get_drvdata(ofdev);
struct device_node *np = ofdev->dev.of_node;
struct resource res;
struct dma_chan *chan, *_chan;
struct ppc_dma_chan_ref *ref, *_ref;
struct ppc440spe_adma_chan *ppc440spe_chan;
- dev_set_drvdata(&ofdev->dev, NULL);
if (adev->id < PPC440SPE_ADMA_ENGINES_NUM)
ppc440spe_adma_devices[adev->id] = -1;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] dma: use platform_{get,set}_drvdata()
2013-05-24 1:10 [PATCH] dma: use platform_{get,set}_drvdata() Jingoo Han
@ 2013-05-24 5:14 ` Vinod Koul
0 siblings, 0 replies; 2+ messages in thread
From: Vinod Koul @ 2013-05-24 5:14 UTC (permalink / raw)
To: Jingoo Han
Cc: 'Dan Williams', linux-kernel, Li Yang,
'Zhang Wei'
On Fri, May 24, 2013 at 10:10:13AM +0900, Jingoo Han wrote:
> 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>
Applied thanks
--
~Vinod
> ---
> drivers/dma/fsldma.c | 5 ++---
> drivers/dma/ppc4xx/adma.c | 5 ++---
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
> index 4fc2980..49e8fbd 100644
> --- a/drivers/dma/fsldma.c
> +++ b/drivers/dma/fsldma.c
> @@ -1368,7 +1368,7 @@ static int fsldma_of_probe(struct platform_device *op)
>
> dma_set_mask(&(op->dev), DMA_BIT_MASK(36));
>
> - dev_set_drvdata(&op->dev, fdev);
> + platform_set_drvdata(op, fdev);
>
> /*
> * We cannot use of_platform_bus_probe() because there is no
> @@ -1417,7 +1417,7 @@ static int fsldma_of_remove(struct platform_device *op)
> struct fsldma_device *fdev;
> unsigned int i;
>
> - fdev = dev_get_drvdata(&op->dev);
> + fdev = platform_get_drvdata(op);
> dma_async_device_unregister(&fdev->common);
>
> fsldma_free_irqs(fdev);
> @@ -1428,7 +1428,6 @@ static int fsldma_of_remove(struct platform_device *op)
> }
>
> iounmap(fdev->regs);
> - dev_set_drvdata(&op->dev, NULL);
> kfree(fdev);
>
> return 0;
> diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
> index 5d3d955..e68c51d 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)
> adev->dev = &ofdev->dev;
> adev->common.dev = &ofdev->dev;
> INIT_LIST_HEAD(&adev->common.channels);
> - dev_set_drvdata(&ofdev->dev, adev);
> + platform_set_drvdata(ofdev, adev);
>
> /* create a channel */
> chan = kzalloc(sizeof(*chan), GFP_KERNEL);
> @@ -4594,14 +4594,13 @@ out:
> */
> static int ppc440spe_adma_remove(struct platform_device *ofdev)
> {
> - struct ppc440spe_adma_device *adev = dev_get_drvdata(&ofdev->dev);
> + struct ppc440spe_adma_device *adev = platform_get_drvdata(ofdev);
> struct device_node *np = ofdev->dev.of_node;
> struct resource res;
> struct dma_chan *chan, *_chan;
> struct ppc_dma_chan_ref *ref, *_ref;
> struct ppc440spe_adma_chan *ppc440spe_chan;
>
> - dev_set_drvdata(&ofdev->dev, NULL);
> if (adev->id < PPC440SPE_ADMA_ENGINES_NUM)
> ppc440spe_adma_devices[adev->id] = -1;
>
> --
> 1.7.10.4
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-24 5:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-24 1:10 [PATCH] dma: use platform_{get,set}_drvdata() Jingoo Han
2013-05-24 5:14 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox