All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cezary Rojewski <cezary.rojewski@intel.com>
To: alsa-devel@alsa-project.org, broonie@kernel.org
Cc: tiwai@suse.com, perex@perex.cz,
	amadeuszx.slawinski@linux.intel.com,
	pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com,
	lgirdwood@gmail.com, heiko@sntech.de,
	linux-rockchip@lists.infradead.org, Syed.SabaKareem@amd.com,
	Vijendar.Mukunda@amd.com, AjitKumar.Pandey@amd.com,
	jiaxin.yu@mediatek.com, trevor.wu@mediatek.com,
	Cezary Rojewski <cezary.rojewski@intel.com>
Subject: [PATCH 3/7] ASoC: mediatek: Drop da7219_aad_jack_det() usage
Date: Mon, 31 Oct 2022 17:02:23 +0100	[thread overview]
Message-ID: <20221031160227.2352630-4-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20221031160227.2352630-1-cezary.rojewski@intel.com>

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

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
 sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c        | 3 +--
 sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
index 9f22d3939818..97dbb31c412e 100644
--- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
@@ -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;
 }
diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c
index cfca6bdee834..db5d2bec7a95 100644
--- a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c
@@ -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;
 }
-- 
2.25.1


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

WARNING: multiple messages have this Message-ID (diff)
From: Cezary Rojewski <cezary.rojewski@intel.com>
To: alsa-devel@alsa-project.org, broonie@kernel.org
Cc: Cezary Rojewski <cezary.rojewski@intel.com>,
	Vijendar.Mukunda@amd.com, heiko@sntech.de,
	AjitKumar.Pandey@amd.com, linux-rockchip@lists.infradead.org,
	tiwai@suse.com, pierre-louis.bossart@linux.intel.com,
	jiaxin.yu@mediatek.com, lgirdwood@gmail.com, hdegoede@redhat.com,
	Syed.SabaKareem@amd.com, amadeuszx.slawinski@linux.intel.com,
	trevor.wu@mediatek.com
Subject: [PATCH 3/7] ASoC: mediatek: Drop da7219_aad_jack_det() usage
Date: Mon, 31 Oct 2022 17:02:23 +0100	[thread overview]
Message-ID: <20221031160227.2352630-4-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20221031160227.2352630-1-cezary.rojewski@intel.com>

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

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
 sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c        | 3 +--
 sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
index 9f22d3939818..97dbb31c412e 100644
--- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
@@ -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;
 }
diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c
index cfca6bdee834..db5d2bec7a95 100644
--- a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c
@@ -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;
 }
-- 
2.25.1


  parent reply	other threads:[~2022-10-31 15:50 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-31 16:02 [PATCH 0/7] ASoC: codecs: da7219: Do not export da7219_aad_jack_det() Cezary Rojewski
2022-10-31 16:02 ` Cezary Rojewski
2022-10-31 16:02 ` [PATCH 1/7] ASoC: codecs: da7219: Introduce set_jack() callback Cezary Rojewski
2022-10-31 16:02   ` Cezary Rojewski
2022-10-31 16:02 ` [PATCH 2/7] ASoC: Intel: Drop da7219_aad_jack_det() usage Cezary Rojewski
2022-10-31 16:02   ` Cezary Rojewski
2022-10-31 16:02 ` Cezary Rojewski [this message]
2022-10-31 16:02   ` [PATCH 3/7] ASoC: mediatek: " Cezary Rojewski
2022-10-31 16:02 ` [PATCH 4/7] ASoC: rockchip: " Cezary Rojewski
2022-10-31 16:02   ` Cezary Rojewski
2022-10-31 16:02 ` [PATCH 5/7] ASoC: amd: " Cezary Rojewski
2022-10-31 16:02   ` Cezary Rojewski
2022-10-31 16:02 ` [PATCH 6/7] ASoC: Intel: avs: " Cezary Rojewski
2022-10-31 16:02   ` Cezary Rojewski
2022-10-31 16:02 ` [PATCH 7/7] ASoC: codecs: da7219: Do not export internal symbols Cezary Rojewski
2022-10-31 16:02   ` Cezary Rojewski
2022-11-10 17:55 ` [PATCH 0/7] ASoC: codecs: da7219: Do not export da7219_aad_jack_det() Mark Brown
2022-11-10 17:55   ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221031160227.2352630-4-cezary.rojewski@intel.com \
    --to=cezary.rojewski@intel.com \
    --cc=AjitKumar.Pandey@amd.com \
    --cc=Syed.SabaKareem@amd.com \
    --cc=Vijendar.Mukunda@amd.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=amadeuszx.slawinski@linux.intel.com \
    --cc=broonie@kernel.org \
    --cc=hdegoede@redhat.com \
    --cc=heiko@sntech.de \
    --cc=jiaxin.yu@mediatek.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=perex@perex.cz \
    --cc=pierre-louis.bossart@linux.intel.com \
    --cc=tiwai@suse.com \
    --cc=trevor.wu@mediatek.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.