[PATCH] soc: remove driver_data direct access of struct device

[PATCH] soc: remove driver_data direct access of struct device

[Roel Kluin]

diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index 510efa6..e4547de 100644
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -1473,8 +1473,8 @@ static int wm8400_codec_probe(struct platform_device *dev)
 
 	codec = &priv->codec;
 	codec->private_data = priv;
-	codec->control_data = dev->dev.driver_data;
-	priv->wm8400 = dev->dev.driver_data;
+	codec->control_data = dev_get_drvdata(&dev->dev);
+	priv->wm8400 = dev_get_drvdata(&dev->dev);
 
 	ret = regulator_bulk_get(priv->wm8400->dev,
 				 ARRAY_SIZE(power), &power[0]);
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index e043e3f..7a20587 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -666,14 +666,14 @@ static int __devinit wm8731_spi_probe(struct spi_device *spi)
 	codec->hw_write = (hw_write_t)wm8731_spi_write;
 	codec->dev = &spi->dev;
 
-	spi->dev.driver_data = wm8731;
+	dev_set_drvdata(&spi->dev, wm8731);
 
 	return wm8731_register(wm8731);
 }
 
 static int __devexit wm8731_spi_remove(struct spi_device *spi)
 {
-	struct wm8731_priv *wm8731 = spi->dev.driver_data;
+	struct wm8731_priv *wm8731 = dev_get_drvdata(&spi->dev);
 
 	wm8731_unregister(wm8731);
 
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index a6e8f3f..d121e58 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1822,14 +1822,14 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi)
 	codec->hw_write = (hw_write_t)wm8753_spi_write;
 	codec->dev = &spi->dev;
 
-	spi->dev.driver_data = wm8753;
+	dev_set_drvdata(&spi->dev, wm8753);
 
 	return wm8753_register(wm8753);
 }
 
 static int __devexit wm8753_spi_remove(struct spi_device *spi)
 {
-	struct wm8753_priv *wm8753 = spi->dev.driver_data;
+	struct wm8753_priv *wm8753 = dev_get_drvdata(&spi->dev);
 	wm8753_unregister(wm8753);
 	return 0;
 }

Re: [alsa-devel] [PATCH] soc: remove driver_data direct access of struct device

[Mark Brown]

On Mon, May 11, 2009 at 09:57:08PM +0200, Roel Kluin wrote:

I've applied this since it's so trivial but please in future:

 - Give a Signed-off-by for your patches.
 - CC maintainers for your patches.

> diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
> index 510efa6..e4547de 100644
> --- a/sound/soc/codecs/wm8400.c
> +++ b/sound/soc/codecs/wm8400.c
> @@ -1473,8 +1473,8 @@ static int wm8400_codec_probe(struct platform_device *dev)
>  
>  	codec = &priv->codec;
>  	codec->private_data = priv;
> -	codec->control_data = dev->dev.driver_data;
> -	priv->wm8400 = dev->dev.driver_data;
> +	codec->control_data = dev_get_drvdata(&dev->dev);
> +	priv->wm8400 = dev_get_drvdata(&dev->dev);
>  
>  	ret = regulator_bulk_get(priv->wm8400->dev,
>  				 ARRAY_SIZE(power), &power[0]);
> diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
> index e043e3f..7a20587 100644
> --- a/sound/soc/codecs/wm8731.c
> +++ b/sound/soc/codecs/wm8731.c
> @@ -666,14 +666,14 @@ static int __devinit wm8731_spi_probe(struct spi_device *spi)
>  	codec->hw_write = (hw_write_t)wm8731_spi_write;
>  	codec->dev = &spi->dev;
>  
> -	spi->dev.driver_data = wm8731;
> +	dev_set_drvdata(&spi->dev, wm8731);
>  
>  	return wm8731_register(wm8731);
>  }
>  
>  static int __devexit wm8731_spi_remove(struct spi_device *spi)
>  {
> -	struct wm8731_priv *wm8731 = spi->dev.driver_data;
> +	struct wm8731_priv *wm8731 = dev_get_drvdata(&spi->dev);
>  
>  	wm8731_unregister(wm8731);
>  
> diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
> index a6e8f3f..d121e58 100644
> --- a/sound/soc/codecs/wm8753.c
> +++ b/sound/soc/codecs/wm8753.c
> @@ -1822,14 +1822,14 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi)
>  	codec->hw_write = (hw_write_t)wm8753_spi_write;
>  	codec->dev = &spi->dev;
>  
> -	spi->dev.driver_data = wm8753;
> +	dev_set_drvdata(&spi->dev, wm8753);
>  
>  	return wm8753_register(wm8753);
>  }
>  
>  static int __devexit wm8753_spi_remove(struct spi_device *spi)
>  {
> -	struct wm8753_priv *wm8753 = spi->dev.driver_data;
> +	struct wm8753_priv *wm8753 = dev_get_drvdata(&spi->dev);
>  	wm8753_unregister(wm8753);
>  	return 0;
>  }
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 

-- 
"You grabbed my hand and we fell into it, like a daydream - or a fever."