Unverified Commit 922a5e5a authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: mediatek: Drop da7219_aad_jack_det() usage 



Do not access the internal function directly, do so through
component->set_jack() instead.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20221031160227.2352630-4-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9a1fe79d

sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <sound/pcm_params.h>

#include <sound/soc.h>



#include "../../codecs/da7219-aad.h"

#include "../../codecs/da7219.h"

#include "../../codecs/rt1015.h"

#include "../common/mtk-afe-platform-driver.h"
@@ -592,7 +591,7 @@ mt8183_da7219_max98357_headset_init(struct snd_soc_component *component) 
	snd_jack_set_key(

		priv->headset_jack.jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);



	da7219_aad_jack_det(component, &priv->headset_jack);

	snd_soc_component_set_jack(component, &priv->headset_jack, NULL);



	return 0;

}

sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c

+2 −2
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ 
#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/pm_runtime.h>

#include <sound/jack.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>



#include "../../codecs/da7219-aad.h"

#include "../../codecs/da7219.h"

#include "../../codecs/mt6358.h"

#include "../common/mtk-afe-platform-driver.h"
@@ -100,7 +100,7 @@ static int mt8186_da7219_init(struct snd_soc_pcm_runtime *rtd) 
	snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN);

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



	da7219_aad_jack_det(cmpnt_codec, &priv->headset_jack);

	snd_soc_component_set_jack(cmpnt_codec, &priv->headset_jack, NULL);



	return 0;

}