Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / sound / soc / codecs / sirf-audio-codec.c

diff --git a/sound/soc/codecs/sirf-audio-codec.c b/sound/soc/codecs/sirf-audio-codec.c
index 06ba492..0a8e43c 100644 (file)
--- a/sound/soc/codecs/sirf-audio-codec.c
+++ b/sound/soc/codecs/sirf-audio-codec.c
@@ -120,7 +120,8 @@ static int atlas6_codec_enable_and_reset_event(struct snd_soc_dapm_widget *w,
 {
 #define ATLAS6_CODEC_ENABLE_BITS (1 << 29)
 #define ATLAS6_CODEC_RESET_BITS (1 << 28)
-       struct sirf_audio_codec *sirf_audio_codec = dev_get_drvdata(w->codec->dev);
+       struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+       struct sirf_audio_codec *sirf_audio_codec = snd_soc_codec_get_drvdata(codec);
        switch (event) {
        case SND_SOC_DAPM_PRE_PMU:
                enable_and_reset_codec(sirf_audio_codec->regmap,
@@ -142,7 +143,8 @@ static int prima2_codec_enable_and_reset_event(struct snd_soc_dapm_widget *w,
 {
 #define PRIMA2_CODEC_ENABLE_BITS (1 << 27)
 #define PRIMA2_CODEC_RESET_BITS (1 << 26)
-       struct sirf_audio_codec *sirf_audio_codec = dev_get_drvdata(w->codec->dev);
+       struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+       struct sirf_audio_codec *sirf_audio_codec = snd_soc_codec_get_drvdata(codec);
        switch (event) {
        case SND_SOC_DAPM_POST_PMU:
                enable_and_reset_codec(sirf_audio_codec->regmap,
@@ -565,7 +567,6 @@ static const struct dev_pm_ops sirf_audio_codec_pm_ops = {
 static struct platform_driver sirf_audio_codec_driver = {
        .driver = {
                .name = "sirf-audio-codec",
-               .owner = THIS_MODULE,
                .of_match_table = sirf_audio_codec_of_match,
                .pm = &sirf_audio_codec_pm_ops,
        },