[6/6] ASoC: jz4740: Remove redundant platform_set_drvdata()

Message ID 1367572164-19523-6-git-send-email-sachin.kamat@linaro.org
State Accepted
Headers show

Commit Message

Sachin Kamat May 3, 2013, 9:09 a.m.
Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
driver is bound) removes the need to set driver data field to
NULL.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>
---
 sound/soc/codecs/jz4740.c     |    2 --
 sound/soc/jz4740/jz4740-i2s.c |    1 -
 2 files changed, 3 deletions(-)

Comments

Lars-Peter Clausen May 3, 2013, 9:24 a.m. | #1
On 05/03/2013 11:09 AM, Sachin Kamat wrote:
> Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
> driver is bound) removes the need to set driver data field to
> NULL.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Lars-Peter Clausen <lars@metafoo.de>

Acked-by: Lars-Peter Clausen <lars@metatfoo.de>

Thanks

> ---
>  sound/soc/codecs/jz4740.c     |    2 --
>  sound/soc/jz4740/jz4740-i2s.c |    1 -
>  2 files changed, 3 deletions(-)
> 
> diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c
> index 5f607b3..bcebd1a 100644
> --- a/sound/soc/codecs/jz4740.c
> +++ b/sound/soc/codecs/jz4740.c
> @@ -384,8 +384,6 @@ static int jz4740_codec_remove(struct platform_device *pdev)
>  {
>  	snd_soc_unregister_codec(&pdev->dev);
>  
> -	platform_set_drvdata(pdev, NULL);
> -
>  	return 0;
>  }
>  
> diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
> index 9a12644..cafc6ed 100644
> --- a/sound/soc/jz4740/jz4740-i2s.c
> +++ b/sound/soc/jz4740/jz4740-i2s.c
> @@ -509,7 +509,6 @@ static int jz4740_i2s_dev_remove(struct platform_device *pdev)
>  	iounmap(i2s->base);
>  	release_mem_region(i2s->mem->start, resource_size(i2s->mem));
>  
> -	platform_set_drvdata(pdev, NULL);
>  	kfree(i2s);
>  
>  	return 0;
Mark Brown May 3, 2013, 9:40 a.m. | #2
On Fri, May 03, 2013 at 02:39:24PM +0530, Sachin Kamat wrote:
> Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
> driver is bound) removes the need to set driver data field to
> NULL.

Applied, thanks.

Patch

diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c
index 5f607b3..bcebd1a 100644
--- a/sound/soc/codecs/jz4740.c
+++ b/sound/soc/codecs/jz4740.c
@@ -384,8 +384,6 @@  static int jz4740_codec_remove(struct platform_device *pdev)
 {
 	snd_soc_unregister_codec(&pdev->dev);
 
-	platform_set_drvdata(pdev, NULL);
-
 	return 0;
 }
 
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 9a12644..cafc6ed 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -509,7 +509,6 @@  static int jz4740_i2s_dev_remove(struct platform_device *pdev)
 	iounmap(i2s->base);
 	release_mem_region(i2s->mem->start, resource_size(i2s->mem));
 
-	platform_set_drvdata(pdev, NULL);
 	kfree(i2s);
 
 	return 0;