2013-08-21 09:45:39

by Jingoo Han

Subject: [PATCH] dma: sh: remove unnecessary platform_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.

Signed-off-by: Jingoo Han <[email protected]>
---
drivers/dma/sh/shdma.c | 3 ---
drivers/dma/sh/sudmac.c | 2 --
2 files changed, 5 deletions(-)

diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c
index 211e2f1..208de0f 100644
--- a/drivers/dma/sh/shdma.c
+++ b/drivers/dma/sh/shdma.c
@@ -873,7 +873,6 @@ rst_err:
pm_runtime_put(&pdev->dev);
pm_runtime_disable(&pdev->dev);

- platform_set_drvdata(pdev, NULL);
shdma_cleanup(&shdev->shdma_dev);
eshdma:
if (dmars)
@@ -917,8 +916,6 @@ static int sh_dmae_remove(struct platform_device *pdev)
iounmap(shdev->dmars);
iounmap(shdev->chan_reg);

- platform_set_drvdata(pdev, NULL);
-
synchronize_rcu();
kfree(shdev);

diff --git a/drivers/dma/sh/sudmac.c b/drivers/dma/sh/sudmac.c
index c494417..23fffc8 100644
--- a/drivers/dma/sh/sudmac.c
+++ b/drivers/dma/sh/sudmac.c
@@ -393,7 +393,6 @@ static int sudmac_probe(struct platform_device *pdev)
chan_probe_err:
sudmac_chan_remove(su_dev);

- platform_set_drvdata(pdev, NULL);
shdma_cleanup(&su_dev->shdma_dev);

return err;
@@ -407,7 +406,6 @@ static int sudmac_remove(struct platform_device *pdev)
dma_async_device_unregister(dma_dev);
sudmac_chan_remove(su_dev);
shdma_cleanup(&su_dev->shdma_dev);
- platform_set_drvdata(pdev, NULL);

return 0;
}
--
1.7.10.4

2013-08-22 00:31:22

by Simon Horman

Subject: Re: [PATCH] dma: sh: remove unnecessary platform_set_drvdata()

On Wed, Aug 21, 2013 at 06:45:35PM +0900, Jingoo Han wrote:
> The driver core clears the driver data to NULL after device_release
> or on probe failure. Thus, it is not needed to manually clear the
> device driver data to NULL.

Acked-by: Simon Horman <[email protected]>

Vinod, could you take this?

>
> Signed-off-by: Jingoo Han <[email protected]>
> ---
> drivers/dma/sh/shdma.c | 3 ---
> drivers/dma/sh/sudmac.c | 2 --
> 2 files changed, 5 deletions(-)
>
> diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c
> index 211e2f1..208de0f 100644
> --- a/drivers/dma/sh/shdma.c
> +++ b/drivers/dma/sh/shdma.c
> @@ -873,7 +873,6 @@ rst_err:
> pm_runtime_put(&pdev->dev);
> pm_runtime_disable(&pdev->dev);
>
> - platform_set_drvdata(pdev, NULL);
> shdma_cleanup(&shdev->shdma_dev);
> eshdma:
> if (dmars)
> @@ -917,8 +916,6 @@ static int sh_dmae_remove(struct platform_device *pdev)
> iounmap(shdev->dmars);
> iounmap(shdev->chan_reg);
>
> - platform_set_drvdata(pdev, NULL);
> -
> synchronize_rcu();
> kfree(shdev);
>
> diff --git a/drivers/dma/sh/sudmac.c b/drivers/dma/sh/sudmac.c
> index c494417..23fffc8 100644
> --- a/drivers/dma/sh/sudmac.c
> +++ b/drivers/dma/sh/sudmac.c
> @@ -393,7 +393,6 @@ static int sudmac_probe(struct platform_device *pdev)
> chan_probe_err:
> sudmac_chan_remove(su_dev);
>
> - platform_set_drvdata(pdev, NULL);
> shdma_cleanup(&su_dev->shdma_dev);
>
> return err;
> @@ -407,7 +406,6 @@ static int sudmac_remove(struct platform_device *pdev)
> dma_async_device_unregister(dma_dev);
> sudmac_chan_remove(su_dev);
> shdma_cleanup(&su_dev->shdma_dev);
> - platform_set_drvdata(pdev, NULL);
>
> return 0;
> }
> --
> 1.7.10.4
>
>

2013-08-26 12:38:32

by Guennadi Liakhovetski

Subject: Re: [PATCH] dma: sh: remove unnecessary platform_set_drvdata()

On Wed, 21 Aug 2013, Jingoo Han wrote:

> The driver core clears the driver data to NULL after device_release
> or on probe failure. Thus, it is not needed to manually clear the
> device driver data to NULL.
>
> Signed-off-by: Jingoo Han <[email protected]>

This has to be updated on top of current
http://git.infradead.org/users/vkoul/slave-dma.git next branch, there it
will patch the drivers/dma/sh/shdmac.c file, not drivers/dma/sh/shdma.c.
After that feel free to add my

Acked-by: Guennadi Liakhovetski <[email protected]>

Thanks
Guennadi

> ---
> drivers/dma/sh/shdma.c | 3 ---
> drivers/dma/sh/sudmac.c | 2 --
> 2 files changed, 5 deletions(-)
>
> diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c
> index 211e2f1..208de0f 100644
> --- a/drivers/dma/sh/shdma.c
> +++ b/drivers/dma/sh/shdma.c
> @@ -873,7 +873,6 @@ rst_err:
> pm_runtime_put(&pdev->dev);
> pm_runtime_disable(&pdev->dev);
>
> - platform_set_drvdata(pdev, NULL);
> shdma_cleanup(&shdev->shdma_dev);
> eshdma:
> if (dmars)
> @@ -917,8 +916,6 @@ static int sh_dmae_remove(struct platform_device *pdev)
> iounmap(shdev->dmars);
> iounmap(shdev->chan_reg);
>
> - platform_set_drvdata(pdev, NULL);
> -
> synchronize_rcu();
> kfree(shdev);
>
> diff --git a/drivers/dma/sh/sudmac.c b/drivers/dma/sh/sudmac.c
> index c494417..23fffc8 100644
> --- a/drivers/dma/sh/sudmac.c
> +++ b/drivers/dma/sh/sudmac.c
> @@ -393,7 +393,6 @@ static int sudmac_probe(struct platform_device *pdev)
> chan_probe_err:
> sudmac_chan_remove(su_dev);
>
> - platform_set_drvdata(pdev, NULL);
> shdma_cleanup(&su_dev->shdma_dev);
>
> return err;
> @@ -407,7 +406,6 @@ static int sudmac_remove(struct platform_device *pdev)
> dma_async_device_unregister(dma_dev);
> sudmac_chan_remove(su_dev);
> shdma_cleanup(&su_dev->shdma_dev);
> - platform_set_drvdata(pdev, NULL);
>
> return 0;
> }
> --
> 1.7.10.4
>
>

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

2013-08-26 14:35:31

by Vinod Koul

Subject: Re: [PATCH] dma: sh: remove unnecessary platform_set_drvdata()

On Mon, Aug 26, 2013 at 02:38:17PM +0200, Guennadi Liakhovetski wrote:
> On Wed, 21 Aug 2013, Jingoo Han wrote:
>
> > The driver core clears the driver data to NULL after device_release
> > or on probe failure. Thus, it is not needed to manually clear the
> > device driver data to NULL.
> >
> > Signed-off-by: Jingoo Han <[email protected]>
>
> This has to be updated on top of current
> http://git.infradead.org/users/vkoul/slave-dma.git next branch, there it
> will patch the drivers/dma/sh/shdmac.c file, not drivers/dma/sh/shdma.c.
> After that feel free to add my
He already updated & i have applied...
>
> Acked-by: Guennadi Liakhovetski <[email protected]>
added...

~Vinod