Unverified Commit 37a04911 authored by Oder Chiou's avatar Oder Chiou Committed by Mark Brown
Browse files

ASoC: rt5663: Use the set_jack() instead of the export function 



The patch replaces the export function with the new API set_jack().

Signed-off-by: default avatarOder Chiou <oder_chiou@realtek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1cc0fe24

sound/soc/codecs/rt5663.c

+2 −3
Original line number Diff line number Diff line
@@ -1857,7 +1857,7 @@ static irqreturn_t rt5663_irq(int irq, void *data) 
}



int rt5663_set_jack_detect(struct snd_soc_component *component,

	struct snd_soc_jack *hs_jack)

	struct snd_soc_jack *hs_jack, void *data)

{

	struct rt5663_priv *rt5663 = snd_soc_component_get_drvdata(component);
@@ -1867,7 +1867,6 @@ int rt5663_set_jack_detect(struct snd_soc_component *component, 


	return 0;

}

EXPORT_SYMBOL_GPL(rt5663_set_jack_detect);



static bool rt5663_check_jd_status(struct snd_soc_component *component)

{
@@ -3244,10 +3243,10 @@ static const struct snd_soc_component_driver soc_component_dev_rt5663 = { 
	.num_dapm_widgets	= ARRAY_SIZE(rt5663_dapm_widgets),

	.dapm_routes		= rt5663_dapm_routes,

	.num_dapm_routes	= ARRAY_SIZE(rt5663_dapm_routes),

	.set_jack		= rt5663_set_jack_detect,

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,



};



static const struct regmap_config rt5663_v2_regmap = {

sound/soc/codecs/rt5663.h

+0 −2
Original line number Diff line number Diff line
@@ -1125,8 +1125,6 @@ enum { 
	RT5663_AD_STEREO_FILTER = 0x2,

};



int rt5663_set_jack_detect(struct snd_soc_component *component,

	struct snd_soc_jack *hs_jack);

int rt5663_sel_asrc_clk_src(struct snd_soc_component *component,

	unsigned int filter_mask, unsigned int clk_src);

sound/soc/intel/boards/kbl_rt5663_max98927.c

+2 −1
Original line number Diff line number Diff line
@@ -299,7 +299,8 @@ static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd) 
	snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);



	rt5663_set_jack_detect(component, &ctx->kabylake_headset);

	snd_soc_component_set_jack(component, &ctx->kabylake_headset, NULL);



	return ret;

}

sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd) 
	snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);



	rt5663_set_jack_detect(component, &ctx->kabylake_headset);

	snd_soc_component_set_jack(component, &ctx->kabylake_headset, NULL);



	ret = snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "DMIC");

	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE