diff options
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/wm8400.c | 4 | ||||
-rw-r--r-- | sound/soc/codecs/wm8731.c | 4 | ||||
-rw-r--r-- | sound/soc/codecs/wm8753.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index 510efa604008..e4547de8eec2 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) | |||
1473 | 1473 | ||
1474 | codec = &priv->codec; | 1474 | codec = &priv->codec; |
1475 | codec->private_data = priv; | 1475 | codec->private_data = priv; |
1476 | codec->control_data = dev->dev.driver_data; | 1476 | codec->control_data = dev_get_drvdata(&dev->dev); |
1477 | priv->wm8400 = dev->dev.driver_data; | 1477 | priv->wm8400 = dev_get_drvdata(&dev->dev); |
1478 | 1478 | ||
1479 | ret = regulator_bulk_get(priv->wm8400->dev, | 1479 | ret = regulator_bulk_get(priv->wm8400->dev, |
1480 | ARRAY_SIZE(power), &power[0]); | 1480 | ARRAY_SIZE(power), &power[0]); |
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index e043e3f60008..7a205876ef4f 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) | |||
666 | codec->hw_write = (hw_write_t)wm8731_spi_write; | 666 | codec->hw_write = (hw_write_t)wm8731_spi_write; |
667 | codec->dev = &spi->dev; | 667 | codec->dev = &spi->dev; |
668 | 668 | ||
669 | spi->dev.driver_data = wm8731; | 669 | dev_set_drvdata(&spi->dev, wm8731); |
670 | 670 | ||
671 | return wm8731_register(wm8731); | 671 | return wm8731_register(wm8731); |
672 | } | 672 | } |
673 | 673 | ||
674 | static int __devexit wm8731_spi_remove(struct spi_device *spi) | 674 | static int __devexit wm8731_spi_remove(struct spi_device *spi) |
675 | { | 675 | { |
676 | struct wm8731_priv *wm8731 = spi->dev.driver_data; | 676 | struct wm8731_priv *wm8731 = dev_get_drvdata(&spi->dev); |
677 | 677 | ||
678 | wm8731_unregister(wm8731); | 678 | wm8731_unregister(wm8731); |
679 | 679 | ||
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index a6e8f3f7f052..d121e58cae2b 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) | |||
1822 | codec->hw_write = (hw_write_t)wm8753_spi_write; | 1822 | codec->hw_write = (hw_write_t)wm8753_spi_write; |
1823 | codec->dev = &spi->dev; | 1823 | codec->dev = &spi->dev; |
1824 | 1824 | ||
1825 | spi->dev.driver_data = wm8753; | 1825 | dev_set_drvdata(&spi->dev, wm8753); |
1826 | 1826 | ||
1827 | return wm8753_register(wm8753); | 1827 | return wm8753_register(wm8753); |
1828 | } | 1828 | } |
1829 | 1829 | ||
1830 | static int __devexit wm8753_spi_remove(struct spi_device *spi) | 1830 | static int __devexit wm8753_spi_remove(struct spi_device *spi) |
1831 | { | 1831 | { |
1832 | struct wm8753_priv *wm8753 = spi->dev.driver_data; | 1832 | struct wm8753_priv *wm8753 = dev_get_drvdata(&spi->dev); |
1833 | wm8753_unregister(wm8753); | 1833 | wm8753_unregister(wm8753); |
1834 | return 0; | 1834 | return 0; |
1835 | } | 1835 | } |