ASoC: rt5651: Use standard component set_jack callback

Use the standard component set_jack callback instead of defining a codec
private API for this.

Tested-by: Carlo Caione <carlo@endlessm.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index c9698229fc337df3cae2268e4acf762a1ae6787c..030889143249b7ea849635d48f0024e2020c7d56 100644 (file)
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -1593,8 +1593,8 @@ static irqreturn_t rt5651_irq(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-int rt5651_set_jack_detect(struct snd_soc_component *component,
-                          struct snd_soc_jack *hp_jack)
+static int rt5651_set_jack(struct snd_soc_component *component,
+                          struct snd_soc_jack *hp_jack, void *data)
 {
        struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
        struct rt5651_priv *rt5651 = snd_soc_component_get_drvdata(component);
@@ -1658,7 +1658,6 @@ int rt5651_set_jack_detect(struct snd_soc_component *component,
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(rt5651_set_jack_detect);
 
 static int rt5651_probe(struct snd_soc_component *component)
 {
@@ -1762,6 +1761,7 @@ static const struct snd_soc_component_driver soc_component_dev_rt5651 = {
        .suspend                = rt5651_suspend,
        .resume                 = rt5651_resume,
        .set_bias_level         = rt5651_set_bias_level,
+       .set_jack               = rt5651_set_jack,
        .controls               = rt5651_snd_controls,
        .num_controls           = ARRAY_SIZE(rt5651_snd_controls),
        .dapm_widgets           = rt5651_dapm_widgets,

diff --git a/sound/soc/codecs/rt5651.h b/sound/soc/codecs/rt5651.h
index 8f128d057ff0074c2c72278e61e0123b6649067f..f3158488fc89a3b0a2c119c251806946bb3888bb 100644 (file)
--- a/sound/soc/codecs/rt5651.h
+++ b/sound/soc/codecs/rt5651.h
@@ -2080,6 +2080,4 @@ struct rt5651_priv {
        bool hp_mute;
 };
 
-int rt5651_set_jack_detect(struct snd_soc_component *component,
-                          struct snd_soc_jack *hp_jack);
 #endif /* __RT5651_H__ */

diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index b6bf92191b9a51bb8367039a184de69e05341a2f..afb27e5e6756431518b0fbe42ba05fe9cc3b7fb5 100644 (file)
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -370,7 +370,7 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime)
                return ret;
        }
 
-       rt5651_set_jack_detect(codec, &priv->jack);
+       snd_soc_component_set_jack(codec, &priv->jack, NULL);
 
        return ret;
 }