ASoC: rt5665: move rt5665_set_jack_detect to .set_jack

Now, we can use .set_jack callback function on codec level. So we
don't need export rt5665_set_jack_detect.

Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c
index 285ec74953796e2fb7da3923258764797b2d6f10..4c5f08551e05b8734ea96710959217b5c869a7e9 100644 (file)
--- a/sound/soc/codecs/rt5665.c
+++ b/sound/soc/codecs/rt5665.c
@@ -1260,8 +1260,8 @@ static void rt5665_jd_check_handler(struct work_struct *work)
        }
 }
 
-int rt5665_set_jack_detect(struct snd_soc_codec *codec,
-       struct snd_soc_jack *hs_jack)
+static int rt5665_set_jack_detect(struct snd_soc_codec *codec,
+       struct snd_soc_jack *hs_jack, void *data)
 {
        struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
 
@@ -1288,7 +1288,6 @@ int rt5665_set_jack_detect(struct snd_soc_codec *codec,
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(rt5665_set_jack_detect);
 
 static void rt5665_jack_detect_handler(struct work_struct *work)
 {
@@ -4567,6 +4566,7 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5665 = {
        },
        .set_sysclk = rt5665_set_codec_sysclk,
        .set_pll = rt5665_set_codec_pll,
+       .set_jack = rt5665_set_jack_detect,
 };
 
 

diff --git a/sound/soc/codecs/rt5665.h b/sound/soc/codecs/rt5665.h
index 12f7080a0d3c3f1eeab2e3083020cffe98599891..d153bba90963a54dfdb6d9aedf100868382b2893 100644 (file)
--- a/sound/soc/codecs/rt5665.h
+++ b/sound/soc/codecs/rt5665.h
@@ -1984,7 +1984,5 @@ enum {
 
 int rt5665_sel_asrc_clk_src(struct snd_soc_codec *codec,
                unsigned int filter_mask, unsigned int clk_src);
-int rt5665_set_jack_detect(struct snd_soc_codec *codec,
-       struct snd_soc_jack *hs_jack);
 
 #endif /* __RT5665_H__ */