Unverified Commit 9a1fe79d authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: 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-3-cezary.rojewski@intel.com


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

sound/soc/intel/boards/bxt_da7219_max98357a.c

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

#include "../../codecs/hdac_hdmi.h"

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

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

#include "../common/soc-intel-quirks.h"

#include "hda_dsp_common.h"
@@ -259,7 +258,7 @@ static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) 
	snd_jack_set_key(broxton_headset.jack, SND_JACK_BTN_3,

			 KEY_VOICECOMMAND);



	da7219_aad_jack_det(component, &broxton_headset);

	snd_soc_component_set_jack(component, &broxton_headset, NULL);



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

sound/soc/intel/boards/kbl_da7219_max98357a.c

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

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

#include "../../codecs/hdac_hdmi.h"

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



#define KBL_DIALOG_CODEC_DAI "da7219-hifi"

#define KBL_MAXIM_CODEC_DAI "HiFi"
@@ -207,7 +206,7 @@ static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) 
	snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP);

	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(component, &ctx->kabylake_headset);

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



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

	if (ret)

sound/soc/intel/boards/kbl_da7219_max98927.c

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

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

#include "../../codecs/hdac_hdmi.h"

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



#define KBL_DIALOG_CODEC_DAI	"da7219-hifi"

#define MAX98927_CODEC_DAI	"max98927-aif1"
@@ -382,7 +381,7 @@ static int kabylake_da7219_codec_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(component, &ctx->kabylake_headset);

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



	return 0;

}

sound/soc/intel/boards/sof_da7219_max98373.c

+2 −2
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 


#include <linux/input.h>

#include <linux/module.h>

#include <sound/jack.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <linux/platform_device.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

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

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

#include "hda_dsp_common.h"



#define DIALOG_CODEC_DAI	"da7219-hifi"
@@ -184,7 +184,7 @@ static int da7219_codec_init(struct snd_soc_pcm_runtime *rtd) 
	snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP);

	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(component, jack);

	snd_soc_component_set_jack(component, jack, NULL);



	return ret;

}