diff options
| author | Bard Liao <bardliao@realtek.com> | 2017-04-11 20:07:47 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-04-11 17:05:20 +0100 |
| commit | 97c415a6f6c34b8c3a71b0e6058c89c49bb8285f (patch) | |
| tree | 2084e7e1c75c89cd026d4638debbc8de3482fa01 | |
| parent | b8d4f7a30bab878d8909bb6ee73e8ac47a1646bf (diff) | |
| download | linux-97c415a6f6c34b8c3a71b0e6058c89c49bb8285f.tar.gz | |
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>
| -rw-r--r-- | sound/soc/codecs/rt5665.c | 6 | ||||
| -rw-r--r-- | sound/soc/codecs/rt5665.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c index 285ec7495379..4c5f08551e05 100644 --- 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 12f7080a0d3c..d153bba90963 100644 --- 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__ */ |