From: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati@amd.com>
To: unlisted-recipients:; (no To-header on input)
Cc: <Alexander.Deucher@amd.com>,
Ravulapati Vishnu vardhan rao
<Vishnuvardhanrao.Ravulapati@amd.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
"Takashi Iwai" <tiwai@suse.com>,
Akshu Agrawal <akshu.agrawal@amd.com>,
"Kuninori Morimoto" <kuninori.morimoto.gx@renesas.com>,
YueHaibing <yuehaibing@huawei.com>,
"moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER
MANAGEM..." <alsa-devel@alsa-project.org>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 1/5] ASoC: amd: Renaming snd-soc-card structure and fields
Date: Tue, 28 Jul 2020 21:32:51 +0530 [thread overview]
Message-ID: <20200728160255.31020-2-Vishnuvardhanrao.Ravulapati@amd.com> (raw)
In-Reply-To: <20200728160255.31020-1-Vishnuvardhanrao.Ravulapati@amd.com>
As in future our machine driver supports multiple codecs
So changing naming convention of snd_soc_card struct and its fields.
Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati@amd.com>
---
sound/soc/amd/acp3x-rt5682-max9836.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c
index 6009e444b858..8b5af064864f 100644
--- a/sound/soc/amd/acp3x-rt5682-max9836.c
+++ b/sound/soc/amd/acp3x-rt5682-max9836.c
@@ -290,7 +290,7 @@ static const struct snd_kcontrol_new acp3x_dmic_mux_control =
SOC_DAPM_ENUM_EXT("DMIC Select Mux", acp3x_dmic_enum,
dmic_get, dmic_set);
-static const struct snd_soc_dapm_widget acp3x_widgets[] = {
+static const struct snd_soc_dapm_widget acp3x_5682_widgets[] = {
SND_SOC_DAPM_HP("Headphone Jack", NULL),
SND_SOC_DAPM_SPK("Spk", NULL),
SND_SOC_DAPM_MIC("Headset Mic", NULL),
@@ -298,7 +298,7 @@ static const struct snd_soc_dapm_widget acp3x_widgets[] = {
&acp3x_dmic_mux_control),
};
-static const struct snd_soc_dapm_route acp3x_audio_route[] = {
+static const struct snd_soc_dapm_route acp3x_5682_audio_route[] = {
{"Headphone Jack", NULL, "HPOL"},
{"Headphone Jack", NULL, "HPOR"},
{"IN1P", NULL, "Headset Mic"},
@@ -307,23 +307,23 @@ static const struct snd_soc_dapm_route acp3x_audio_route[] = {
{"Dmic Mux", "Rear Mic", "DMIC"},
};
-static const struct snd_kcontrol_new acp3x_mc_controls[] = {
+static const struct snd_kcontrol_new acp3x_5682_mc_controls[] = {
SOC_DAPM_PIN_SWITCH("Headphone Jack"),
SOC_DAPM_PIN_SWITCH("Spk"),
SOC_DAPM_PIN_SWITCH("Headset Mic"),
};
-static struct snd_soc_card acp3x_card = {
+static struct snd_soc_card acp3x_5682 = {
.name = "acp3xalc5682m98357",
.owner = THIS_MODULE,
.dai_link = acp3x_dai_5682_98357,
.num_links = ARRAY_SIZE(acp3x_dai_5682_98357),
- .dapm_widgets = acp3x_widgets,
- .num_dapm_widgets = ARRAY_SIZE(acp3x_widgets),
- .dapm_routes = acp3x_audio_route,
- .num_dapm_routes = ARRAY_SIZE(acp3x_audio_route),
- .controls = acp3x_mc_controls,
- .num_controls = ARRAY_SIZE(acp3x_mc_controls),
+ .dapm_widgets = acp3x_5682_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(acp3x_5682_widgets),
+ .dapm_routes = acp3x_5682_audio_route,
+ .num_dapm_routes = ARRAY_SIZE(acp3x_5682_audio_route),
+ .controls = acp3x_5682_mc_controls,
+ .num_controls = ARRAY_SIZE(acp3x_5682_mc_controls),
};
static int acp3x_probe(struct platform_device *pdev)
@@ -336,8 +336,8 @@ static int acp3x_probe(struct platform_device *pdev)
if (!machine)
return -ENOMEM;
- card = &acp3x_card;
- acp3x_card.dev = &pdev->dev;
+ card = &acp3x_5682;
+ acp3x_5682.dev = &pdev->dev;
platform_set_drvdata(pdev, card);
snd_soc_card_set_drvdata(card, machine);
@@ -348,11 +348,11 @@ static int acp3x_probe(struct platform_device *pdev)
return PTR_ERR(dmic_sel);
}
- ret = devm_snd_soc_register_card(&pdev->dev, &acp3x_card);
+ ret = devm_snd_soc_register_card(&pdev->dev, &acp3x_5682);
if (ret) {
dev_err(&pdev->dev,
"devm_snd_soc_register_card(%s) failed: %d\n",
- acp3x_card.name, ret);
+ acp3x_5682.name, ret);
return ret;
}
return 0;
--
2.17.1
next parent reply other threads:[~2020-07-28 16:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200728160255.31020-1-Vishnuvardhanrao.Ravulapati@amd.com>
2020-07-28 16:02 ` Ravulapati Vishnu vardhan rao [this message]
2020-07-30 22:27 ` [PATCH v2 1/5] ASoC: amd: Renaming snd-soc-card structure and fields Mark Brown
2020-07-28 16:02 ` [PATCH v2 2/5] ASoC: amd: Passing card structure based on codec Ravulapati Vishnu vardhan rao
2020-07-28 16:02 ` [PATCH v2 3/5] ASoC: amd: Adding support for ALC1015 codec in machine driver Ravulapati Vishnu vardhan rao
2020-07-28 16:02 ` [PATCH v2 4/5] ASoC: amd: Adding DAI LINK for rt1015 codec Ravulapati Vishnu vardhan rao
2020-07-28 16:02 ` [PATCH v2 5/5] ASoC: amd: Added hw_params support for ALC1015 Ravulapati Vishnu vardhan rao
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=20200728160255.31020-2-Vishnuvardhanrao.Ravulapati@amd.com \
--to=vishnuvardhanrao.ravulapati@amd.com \
--cc=Alexander.Deucher@amd.com \
--cc=akshu.agrawal@amd.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
--cc=yuehaibing@huawei.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).