Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 6f0b819a authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown
Browse files

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: default avatarCarlo Caione <carlo@endlessm.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d8b8c878

sound/soc/codecs/rt5651.c

+3 −3
Original line number Diff line number Diff line
@@ -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,

sound/soc/codecs/rt5651.h

+0 −2
Original line number Diff line number Diff line
@@ -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__ */

sound/soc/intel/boards/bytcr_rt5651.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}