Re: [PATCH 7/9] Sound: remove direct access of driver_data

From: Mark Brown
Date: Mon Jul 13 2009 - 05:44:13 EST


On Sun, Jul 12, 2009 at 03:46:04PM -0700, Greg Kroah-Hartman wrote:
> This is the last in-kernel direct usage of driver_data, replace it with
> the proper dev_get/set_drvdata() calls.

Any objections to me applying this to ASoC, and if so do you want it in
2.6.31?

> Cc: Takashi Iwai <tiwai@xxxxxxx>
> Cc: Jaroslav Kysela <perex@xxxxxxxx>
> Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> Cc: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
> ---
> sound/soc/codecs/wm8988.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
> index c05f718..8c0fdf8 100644
> --- a/sound/soc/codecs/wm8988.c
> +++ b/sound/soc/codecs/wm8988.c
> @@ -1037,14 +1037,14 @@ static int __devinit wm8988_spi_probe(struct spi_device *spi)
> codec->control_data = spi;
> codec->dev = &spi->dev;
>
> - spi->dev.driver_data = wm8988;
> + dev_set_drvdata(&spi->dev, wm8988);
>
> return wm8988_register(wm8988);
> }
>
> static int __devexit wm8988_spi_remove(struct spi_device *spi)
> {
> - struct wm8988_priv *wm8988 = spi->dev.driver_data;
> + struct wm8988_priv *wm8988 = dev_get_drvdata(&spi->dev);
>
> wm8988_unregister(wm8988);
>
> --
> 1.6.3.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

--
"You grabbed my hand and we fell into it, like a daydream - or a fever."
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/