ASoC: Intel: fix argument error in nau8824 machine
authorJohn Hsu <KCHSU0@nuvoton.com>
Fri, 2 Mar 2018 02:45:14 +0000 (10:45 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 2 Mar 2018 11:29:20 +0000 (11:29 +0000)
Fix the error: passing argument 1 of 'nau8824_enable_jack_detect'
from incompatible pointer type
  nau8824_enable_jack_detect(codec, jack);
                             ^~~~~
Which expects 'struct snd_soc_component *' but argument is of type
'struct snd_soc_codec *'

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: John Hsu <KCHSU0@nuvoton.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/cht_bsw_nau8824.c

index 08d0b81..680f2b3 100644 (file)
@@ -103,8 +103,8 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
 {
        struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card);
        struct snd_soc_jack *jack = &ctx->jack;
-       struct snd_soc_codec *codec = runtime->codec;
        struct snd_soc_dai *codec_dai = runtime->codec_dai;
+       struct snd_soc_component *component = codec_dai->component;
        int ret, jack_type;
 
        /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */
@@ -134,7 +134,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime)
        snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
        snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
 
-       nau8824_enable_jack_detect(codec, jack);
+       nau8824_enable_jack_detect(component, jack);
 
        return ret;
 }